summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-08 12:17:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 12:17:19 +0000
commit8e2363d124955733416a64dabfbfc4e18a14af6e (patch)
tree81cf55c2d3873522213ad5dbc20c148e1af72278 /libs/androidfw/StringPool.cpp
parent3d82e8cb1d73c3e83d9e7020ee24de824b3149ac (diff)
parent7be25392e14b579afd151677406a361dcc05dbd1 (diff)
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226 Change-Id: Ia12a0fed84dbf3ccef070910458272ab676088c7 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