summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Tianjie Xu <xunchang@google.com> 2020-12-16 23:59:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-16 23:59:21 +0000
commit6b1dcd9930bc5c2512c6e61e113999cd663018ef (patch)
treef99b538a56b4cc38d9aa16d6b2a056288109362c /libs/androidfw/AssetsProvider.cpp
parentf462515bea80fd6c66fb374616bb519caa66ac2c (diff)
parent697c19be17f270989751cf228f5b8efe297882b7 (diff)
Merge "Make AndroidKeyStoreLoadStoreParameter public" am: 697c19be17
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531239 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5db4fa1c402eabe2817d0fa0cc3b41f53111c49f
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions