summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 17:47:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 17:47:43 +0000
commit579de6be178be556e636cb03325d046b2bc7a452 (patch)
tree09705c42b6b0b9bd8dd46e5c62b12d0c2e4282f4 /libs/androidfw/StringPool.cpp
parentf1760c45eeb3da394fdfe746c35bd39505637324 (diff)
parent73f3f3cc1b603b885d7bae587c8617962dd231ed (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 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: Ie0f561a67e5dbebe1f1c5b475bc369f5902a4088 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