summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-12 00:38:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-12 00:38:26 +0000
commitb2c20d602427cf721176863b768de82ab0425c6a (patch)
tree255aba0bd675452f05493e45984a0ac75c5900d5 /libs/androidfw/ApkParsing.cpp
parentc09ed64782637e7b47926d217d0270cd418fdccd (diff)
parentdba7e1288c6315f0ae3783fc7eb56ba1837af9c5 (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: dba7e1288c -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: Ie52d94b78524265637d1dcea7153dcea48a9bdc5 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