summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:16:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:16:11 +0000
commit48a407c9f7977dfe2288521fdc7fe2e3f0aad982 (patch)
tree09705c42b6b0b9bd8dd46e5c62b12d0c2e4282f4 /libs/androidfw/StringPool.cpp
parent75275e1b459a8e88c76a5262326fc2b7a00ba1c3 (diff)
parent23daf1cf1e56e48bcf2d11c084c54bdd16c7ba27 (diff)
[automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 23daf1cf1e -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: Ie7bd2469e0e08d7dc50827ed2fbf1275143c0b63 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