summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-11-22 04:23:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-22 04:23:24 +0000
commit87cd672b7d4b4c1b4742d6c7fd1fd378286c3347 (patch)
tree6252e1f7a3ef1b83d3be21091cb447b62aa12499 /libs/androidfw/AssetsProvider.cpp
parentf0a11f456328e42f4ee8aa67c7e76cde9f6955fd (diff)
parentc13b78eda142dda229f89d8be1979c594cba4c1b (diff)
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours am: dec8f84817 -s ours am: 59d1c8f546 -s ours am: c13b78eda1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541 Change-Id: I0fe656e4412430dfa932cfb7bb500ff3a90c2d0a 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