summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-11-22 03:21:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-22 03:21:47 +0000
commitb86f5cd6d980532b71849aaa1dde08b90aa542fd (patch)
treed9110a680bb8b974db8e0a92fe7b685035b327d3 /libs/androidfw/AssetsProvider.cpp
parent28560a223989ef50de7d09e43b6ca1ed63399521 (diff)
parent1e67b31c012d0209af0a29649c07e5461ce2ff9d (diff)
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours am: 1e67b31c01 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541 Change-Id: Ic2f7d87fb087be9d9e045688483f68277cba4c15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions