summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2020-12-23 15:28:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-23 15:28:18 +0000
commit9e8328287ccd6e48aed455c1e879a50ee25d27a6 (patch)
tree4a08aa00b985a420aadbd3ca40aeef4399ab9ea5 /libs/androidfw/AssetsProvider.cpp
parentf4cba21261149285f740298a00987d43269a3c89 (diff)
parent0fb45fadbc2ebfd88f04d8e4f377140da14c4755 (diff)
Merge "Allow-list service-permission to not track latest api" am: dd5e2cd505 am: 48b91458bd am: 0fb45fadbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534424 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic7d62f96ebaac6fbf24228fb6324a4b8b8037956
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions