summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-26 02:00:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 02:00:15 +0000
commit2de5f0a2cfc12f426078c1b8a2d1bf1ce077aed7 (patch)
tree01e4e1745187befd7811797e0383686cb821c1ff /libs/androidfw/StringPool.cpp
parent3ca03a99dea0a9654c277ae6619effa11d0f67a5 (diff)
parent31937d2f457d437bdb5d558f3044f083496170e3 (diff)
Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 31937d2f45
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19968964 Change-Id: I7853befac500933638ac0bd2ab0cf3f053a6cde8 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