summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2022-06-15 22:17:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-15 22:17:03 +0000
commit2ecc0eee04a05dcb721ba72fcfa37401d87c08aa (patch)
tree46aeb35bc4fb6aba2e7b461c867777fb6376de61 /libs/androidfw/StringPool.cpp
parent1856a11266f00950afd7477c3683c191257a40e9 (diff)
parentb5a2fdd6ca5cee425916e630ba4dec1c41a746d7 (diff)
[automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours am: c39d9728d6 -s ours am: b5a2fdd6ca -s ours
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18907107 Change-Id: I9bfc558747f10125096e63e2901fa431d7e74823 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