summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 03:56:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 03:56:37 +0000
commitdb79a44f6623dff0dd0e4f888f404fe8c53b1b7f (patch)
tree3c220fd3faeae6ef678cc5f78b6e226ff4762c89 /libs/androidfw/StringPool.cpp
parentf1201caaf6398185217742a332281b670e8538e7 (diff)
parente2bb30d14a65ce288e017f2023af1a0347a3651c (diff)
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 3e91dc1fb9 -s ours am: 3a243d920b -s ours am: e2bb30d14a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: Ie6f351f29f291d176c1653df5e12da9c3028994b 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