summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2021-11-24 01:37:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-24 01:37:59 +0000
commite6ff551026dbdeafbace95142af3b596dd115cca (patch)
treefea8db704b237467155988ad6338ace668684d64 /libs/androidfw/StringPool.cpp
parent926b30f01b95d58bd0e8dfe1bee4aa90fb85d7bf (diff)
parentab529ab901e4a2bf0913d2a36aeb1cb3ab44ca34 (diff)
Merge "RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity" into sc-v2-dev am: ab529ab901
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16303380 Change-Id: Idf29428138e30e5eb0d56a7dea61fe65f5b5b9f4
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions