summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-08 12:46:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 12:46:14 +0000
commit79937f60785a016fbabbdf7dbd91398bca7216ad (patch)
tree94fdf4ef7da3d13ab33e130fa390c551be221873 /libs/androidfw/StringPool.cpp
parentaa88b9952a3c6246e4a7d88639468c38ec8e0bc5 (diff)
parentba0245e71eace001b579eab85ea98cce58322047 (diff)
[automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours am: ba0245e71e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226 Change-Id: I92dd7a3a9c9b21d09ea99894d5d88b8844cc2cca 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