summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:52:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:52:06 +0000
commitb8096aa820d15ed422c76379308d4f8c41af8485 (patch)
tree7c8cb4e053a451e3f9298f3aa55b97f2acb3bfc1 /libs/androidfw/StringPool.cpp
parent654f3d020a80719ac5428e09163e5b9ad598c2b3 (diff)
parent4ab7da3b8af8b837ac69e2a027eb6262853be1f8 (diff)
[automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: 73f3f3cc1b -s ours am: 579de6be17 -s ours am: 4ab7da3b8a -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390 Change-Id: Ia97b66947b72a220e8d02c8ae5028fee50713cc6 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