summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-03-30 20:52:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-30 20:52:50 +0000
commit93cbb241b0b16f193806254167e6a7203e68a7d3 (patch)
tree9331e48da04320bdfac0e8c6764126d163ba7d93 /libs/androidfw/StringPool.cpp
parentfc7f22bf8d143f7862923f750e36f987257f3dda (diff)
parentb96ca97ae8e739f82d7c030853c381e60e76744a (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: b96ca97ae8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663 Change-Id: Ib2c8e57a75e67daf16e474a2ac5ce0c74d70501b 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