summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:15:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:15:44 +0000
commit73752268c7669632f1d87517cb021cedde5ad025 (patch)
tree805ddd924eeba024adcdc530648abca992711b09 /libs/androidfw/StringPool.cpp
parent2aeeae8cf8803d91ac0b6c9bbc9e4c6b3e72b11a (diff)
parent1670b026b9fc80488e97da05da4b59056d33fb80 (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: 1670b026b9 -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: I80fc3eddac173dfad71e74e34c1ba72a34fc1f14 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