summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2022-10-29 01:34:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-29 01:34:01 +0000
commit40069bd9d4df56500a757e5e6a9360fda7354556 (patch)
tree8cb7554966667001dc3eb59f5bf033a78a44a24c /libs/androidfw/ApkParsing.cpp
parentd1807912067b94c60290d41e3f61c89dd4014571 (diff)
parent8ed0832a3b20fbddad713dc30b5d017493303780 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0ce am: 28c85af5dd -s ours am: 527e832744 -s ours am: 86124f2a83 -s ours am: d5fa2c29df -s ours am: 8ed0832a3b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122955 Change-Id: If0b007cd4775909aadd885d3a6e8e5df76d17085 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