summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2022-06-15 22:18:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-15 22:18:07 +0000
commit00e915341c6612266447040bc8ed5318e63d21bc (patch)
treeaca7630947428468b0123baf70086b3440c676b1 /libs/androidfw/StringPool.cpp
parent889ba092a675b4cdf0b333bd8b2a6e824d465140 (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: If29b12a0cfb5e7db10263485725d2bab9f0684ac 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