summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Shaquille Johnson <ssjohnson@google.com> 2023-09-18 18:07:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 18:07:42 +0000
commit180646fbb9f765221b2cec5e1a0405834ef2f9ff (patch)
treeb1f28353349dbc2ca1039af1943801227a2c710b /libs/androidfw/AssetsProvider.cpp
parent6d5046f1ce0665cb5bb5d5bdb3d1fb9158fa6759 (diff)
parent5a7aceaa5a2e8df1c590a10678d07d032e1b2d4f (diff)
Merge "[Keystore] Use Strict for every call into keystore" into main am: 250127b2f8 am: f8bb824a56 am: 60db3309fe am: 15a5f59807 am: 5a7aceaa5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2703653 Change-Id: Ia6fd20068f048075706d60bba4be898e645b4758 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