summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Miguel Aranda <miguelaranda@google.com> 2023-01-12 11:23:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-12 11:23:48 +0000
commit837db55aeca413fabf45bd400ff8594c970d8c18 (patch)
tree8bce4bc0142d4096a7adea9452eb4963653f21ac /libs/androidfw/ApkParsing.cpp
parentf4c768b7e9efee352466c3fab4f4e8fac0ce87a9 (diff)
parentd74c5ab44f4bf792284db5d01282b8f259d7cd45 (diff)
Merge "Only use concscrypt certs if directory is nonempty" am: cefc5a13e9 am: d74c5ab44f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2384453 Change-Id: Icc8bbf37b3ec62235f33718382566b40a7bf94ae 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