summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2021-01-29 23:23:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-29 23:23:13 +0000
commit59f5bcf834c6e89e450df5feb92bd2f9a5ebfeb0 (patch)
tree9e6b02a71cc496416dd14dc3e90d9752cd6c0000 /libs/androidfw/AssetsProvider.cpp
parent46309401dbcc884752d7074d182fd463261be1a4 (diff)
parentaf364469e5a6de677e3999905415c09ab8324b5b (diff)
Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e am: af364469e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9987a2c2a98bff2e29cad4624b73bde0c37278dd
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions