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
commit4dbfb21419a83b0ff316347e7e1caa82c5d91c5c (patch)
tree2b53ab61699c1ec58d258916bf705c28a7073abb /libs/androidfw/StringPool.cpp
parenta21b2b7e93303694664fb810066c15e90c8ce855 (diff)
parent9efe4fd3a4857b6c2fe1c8ff29b15c87822a898d (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226 Change-Id: I0759fe98c7662200d9006e212623388e3b5ef887 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