summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 16:59:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 16:59:57 +0000
commit181db6aa71ce77ae8915c94c9e61ca88ba5cd23c (patch)
tree023e4d4dd699bb34a703502e89d5cf3f391081bd /libs/androidfw/StringPool.cpp
parent73f3f3cc1b603b885d7bae587c8617962dd231ed (diff)
parent3392b69c87d52d0e59859d54e73ed9d0dccfb5a9 (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 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: I484b832572348bc3688689f2b40c2979f0a5ad1e 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