summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2022-01-13 01:44:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-13 01:44:54 +0000
commitb559ac4e9f3a52f07c9977fb27e2087141780f74 (patch)
tree27f09f205605e4ae12834daeec9b91a60db3420c /libs/androidfw/StringPool.cpp
parent2ea7255738da8079dd8c33c5946ea034dd221870 (diff)
parent7f876cde41f61289a6c9bc81cdc87ffbedebefc4 (diff)
Merge "Active container should contain non-finishing activity" into sc-v2-dev am: d0f8b5e99d am: 7f876cde41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602935 Change-Id: I7bcda47a4e1f12d35985ef3e156adc14ead594bf
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions