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