summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-03-30 21:29:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-30 21:29:35 +0000
commitad9a2371d8004f86e6e33e012e25b05bf7dee36a (patch)
tree1a2d2df2427d0307c7df1de65bb8f431179d0d64 /libs/androidfw/StringPool.cpp
parent53d1ea357381dd3bc98e45188b0cb068733f853b (diff)
parentf542c6c0b0b693a88ffa3bbfc7686fb6eed17857 (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: 2f5a38fcab -s ours am: b9573bc095 -s ours am: f542c6c0b0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663 Change-Id: Id420c943a61fba6edd8994b384530d9fb17f6c22 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