summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 02:12:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 02:12:38 +0000
commit86138c26fd9c1e2efb3db3c07c9e6645d044d3bc (patch)
tree3e3ac20f7c5d4f4ab0af162d6076be80a515ef44 /libs/androidfw/AssetManager.cpp
parentef00451cc58dcfe026b0c3856d1c0f1178daa03b (diff)
parentd6670385123964d3d258916f0445cec3a32a851b (diff)
Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: I4ee9fc257692776e5dbd465f217ca9d10e693892 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions