summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 05:41:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 05:41:24 +0000
commit84ead264f82d3a2d0713e2f821e2d2c524da142c (patch)
treee6d0f3a452923932eb00798e45df5103e2322334 /libs/androidfw/AssetsProvider.cpp
parent5af0c30004ec1f717668a3ce56bc5afbde67e423 (diff)
parentb7356c1c847b12d6ad702db778de2dd21f238f75 (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: b7356c1c84 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219 Change-Id: I5795655caf468a9d43c2dbc5e42794fdb15fc70e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions