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