summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 19:15:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 19:15:30 +0000
commit78231fedf47e3eb54e2f0c8bfda8717a139ee8ff (patch)
treeb8a7c81af05735cb90e2e2fced73200bbd0b4ca0 /libs/androidfw/AssetsProvider.cpp
parent09583e11482fe1717cab93943bd0e7b435461433 (diff)
parenta946bfa70273fb4ed91d941fa4afa9d19e7f8be2 (diff)
Merge "Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd8b am: 5c55e68dbb" into tm-d1-dev-plus-aosp am: 112ffc8995 am: a946bfa702
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500970 Change-Id: I22fb245fa89ea5c36fddb8d78ecab1d7056f6220 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