summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-27 20:44:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-27 20:44:33 +0000
commit5100971d1b70076399efd0f575c1dcdb9a1619c5 (patch)
tree4c61ccb76382ae2070c7b622600d5063b3e48b34 /libs/androidfw/StringPool.cpp
parent2a7a920007d8957502ccee7ec281cd932f1d3c9b (diff)
parented56031ad41e253064f6c4c644518757b8a9ae1f (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into rvc-dev am: 8038ab1477 am: e8f11f8960 -s ours am: 911725a3ee -s ours am: e3a5eed1d8 -s ours am: 9810b6ef91 -s ours am: fa32a51868 -s ours am: ed56031ad4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20235229 Change-Id: I8d7289cdb873cab835a4a59890cd2c44bd26a23a 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