summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 22:41:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 22:41:24 +0000
commit3a0c620dbeeae5931bb58d444b8af9812892d2d3 (patch)
treef53c03f2419623c91b648d53d0c4fbb1836cb270 /libs/androidfw/AssetsProvider.cpp
parentc668b16501413c8865fb54d1d8e32f496ec95f29 (diff)
parent37dc763e12c3138bee4becb37267039078d960f1 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into sc-dev am: 18db5856cc am: 15ff346130 -s ours am: fa245b1ef3 -s ours am: 08daf34256 -s ours am: 37dc763e12 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105848 Change-Id: I8b940f694a1cf681b04c3c704dc6d2dbd079580c 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