summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Michael Groover <mpgroover@google.com> 2022-04-21 17:16:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-21 17:16:22 +0000
commit851ffe1852cdeb50c5aa9d5cfe7419c670b576fc (patch)
tree53f7d301bc32886b5019c809fd5bd3e31549920e /libs/androidfw/StringPool.cpp
parent9a64e7fe0131d6bfabcaac072fad747127b8ab04 (diff)
parentb065529b6e60e7e892e5dd6b2f9060040c0476a2 (diff)
Merge "Allow revoked capabilities to be restored in sharedUserId lineage" into tm-dev am: 80af2faccf am: b065529b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778610 Change-Id: Ic0338a731543f934adf328c8e818665a36903a6d 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