summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Bart Jarochowski <bpj@google.com> 2023-08-14 22:31:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-14 22:31:19 +0000
commit39dc31d996dd53566c98b9cc0393e604cd76b88d (patch)
tree27f60337c50348cfd653438012afdb4086979517 /libs/androidfw/ZipFileRO.cpp
parent20634ff37de78ddf10a06ad79f8f30a70e4d0779 (diff)
parent906aa2446436050f0ee999cbf1fc9d590b738570 (diff)
Merge "Insert DEFAULT_MGF1_DIGEST SHA-1 on MGF_DIGEST tag when ImportWrappedKey" into main am: 944f53581a am: 0219efd6b9 am: 79e7a132a3 am: 906aa24464
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640452 Change-Id: I0719fb5e9cb8d270b5bcec2abc207e62451661e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions