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