summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-08 11:59:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-08 11:59:44 +0000
commit7be25392e14b579afd151677406a361dcc05dbd1 (patch)
treea0b4da6095653a5e6c0f6ee634bb663058b9d7dd /libs/androidfw/StringPool.cpp
parent2c33c03230bf5927e2535b66187f3d0b47d436e4 (diff)
parent93cb81e46220ee400ae93d02a599feba3f15cad4 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226 Change-Id: I9f942bd80b333cec180bb378f1506a0856d61adc 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