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