summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-11 23:38:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-11 23:38:56 +0000
commitdba7e1288c6315f0ae3783fc7eb56ba1837af9c5 (patch)
tree11948636a021fe85d61363ace544e432d1011005 /libs/androidfw/ApkParsing.cpp
parentd55bd1a471614edd1c48f4a10bc4a9fc94d7feb4 (diff)
parent2be51dbf6a5c5a08b2b7f458d2af36e43837c637 (diff)
[automerger skipped] Merge "Update ukey2_jni API usage" into aosp-main-future am: dcfbb73522 -s ours am: ccf5f16686 -s ours am: 2be51dbf6a -s ours
am skip reason: Merged-In I901b7606acee3dc0ce9bcf47e02b7a299c73cb89 with SHA-1 73acca1ec9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24692802 Change-Id: Idacf6fc4bc6372e54ae25aea5c47e911f6e0b8d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions