summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceUtils.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 05:11:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 05:11:52 +0000
commitb7356c1c847b12d6ad702db778de2dd21f238f75 (patch)
treeb01e7a5574347784f31efee50b743b9b3fd3b88b /libs/androidfw/ResourceUtils.cpp
parent858756a32bdbbea60b743f8939b3fc66682da882 (diff)
parent1d806d66fe04e0edfd54a28a5b34046a4793105f (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 am: 70536c0199 -s ours am: bdf427e3a0 -s ours am: b4b3e02753 -s ours am: e7ab5c3f24 -s ours am: 1d806d66fe -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219 Change-Id: Ibe23be1efad27864a8eeef953de75fd59b574844 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions