summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:55:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:55:04 +0000
commit8edbaa0da7caac97dfede171fa3255c7bd48a1c3 (patch)
tree7c8cb4e053a451e3f9298f3aa55b97f2acb3bfc1 /libs/androidfw/StringPool.cpp
parent3fdec95e618ae05edd62a5956c5cdd677c6003cc (diff)
parenteff224a8c014cf866bc4cdbcaa3a34d555c52c83 (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: 48a407c9f7 -s ours am: eff224a8c0 -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: I051d05806d9ffa9b17170e8641df8daebe78a379 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