summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:21:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:21:14 +0000
commit162408006545b923faa54fe5ddfbfe5f31cf2e51 (patch)
treebb5c84f28e32148c1679ff4cd7f2c50d34d56f11 /libs/androidfw/StringPool.cpp
parent386f5f2ce6f8161646f1c4874a033fddc0bf5529 (diff)
parente8d36bb2c83fa34e9c2c4d227d7bf74344798059 (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: a03bec424a -s ours am: e8d36bb2c8 -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: I3436e019d802b153d6cf2b2a13483e2e850e88b6 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