summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2022-10-29 00:31:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-29 00:31:27 +0000
commit3163204ea955c937c401481db89264900d9f9e0b (patch)
tree6e429494f556a5ecb9395b47048c872b63d07c59 /libs/androidfw/ApkParsing.cpp
parentcd445ec0f5b40fdde9a0ba8666fb8cac6144657b (diff)
parent9954f0b16e09da619df1c07789ca75d45669991b (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into rvc-dev am: 6664a27f76 am: 104d33007e -s ours am: 4c7445249a -s ours am: 89f1ee19ab -s ours am: 9954f0b16e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105226 Change-Id: I6f2b13685830d1e3d64a53a4424c5cffc998ce0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions