summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-26 02:16:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 02:16:22 +0000
commit24192d430cdc612de755a2ab2a04f092240cba58 (patch)
tree42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp
parentda80e4f2070a8c83cfc692e7482091eb1fefff52 (diff)
parent2de5f0a2cfc12f426078c1b8a2d1bf1ce077aed7 (diff)
[automerger skipped] Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 31937d2f45 am: 2de5f0a2cf -s ours
am skip reason: Merged-In I73abb9ec05af95bc14f887ae825a9ada9600f771 with SHA-1 f63ee3bb84 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19968964 Change-Id: I6708c168a6696e630b7630a87d4733920249ad21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions