summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-08 11:59:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 11:59:13 +0000
commit724ac8fd556341be3202925e750d00acdfc6c045 (patch)
tree81cf55c2d3873522213ad5dbc20c148e1af72278 /libs/androidfw/StringPool.cpp
parent0ed5ea25504414baa433a0959b528e3bc8fc068d (diff)
parenta21b2b7e93303694664fb810066c15e90c8ce855 (diff)
[automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408864 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830 Change-Id: I550438b4a0545356eb3be87ba4c2ba6233357421 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