summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Miguel Aranda <miguelaranda@google.com> 2022-12-21 23:58:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-21 23:58:15 +0000
commitcd3609306deb8e205b7a4d48f14fcd801012ac51 (patch)
treeb4656d5ef6524a0a7285953f8a55f19e8c4af53a /libs/androidfw/ApkParsing.cpp
parent2092245ab72182301ae0835762f4d442e3affbaf (diff)
parent0b62dccbbc3f2081902a5426ac5c924c687bef88 (diff)
Merge "Add conscrypt updatable certificates." am: 0b62dccbbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2323439 Change-Id: I4b5a5162437711aca86431cafd4f99e6ad0f6e81 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