summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-08 12:16:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 12:16:55 +0000
commit3d82e8cb1d73c3e83d9e7020ee24de824b3149ac (patch)
tree81cf55c2d3873522213ad5dbc20c148e1af72278 /libs/androidfw/StringPool.cpp
parent724ac8fd556341be3202925e750d00acdfc6c045 (diff)
parent2c33c03230bf5927e2535b66187f3d0b47d436e4 (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: 2c33c03230 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226 Change-Id: I0b703e50d14868fbaf7ee8d8f6648ff50bb4c57f 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