summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 17:48:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 17:48:06 +0000
commit1bd04d17eb675a74bb03c698140aa7ebdb8f246c (patch)
tree09705c42b6b0b9bd8dd46e5c62b12d0c2e4282f4 /libs/androidfw/StringPool.cpp
parent579de6be178be556e636cb03325d046b2bc7a452 (diff)
parent181db6aa71ce77ae8915c94c9e61ca88ba5cd23c (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: 181db6aa71 -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: Ifc251706631fe3ae433446157c48a9d8f8006d16 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