commit | 79e7a132a3d1b323d0a6b9cf2c9814f90fb0dfee | [log] [tgz] |
---|---|---|
author | Bart Jarochowski <bpj@google.com> | Mon Aug 14 05:15:57 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 14 05:15:57 2023 +0000 |
tree | a19cf29d23c9a32f8764c55d1419d8509e66aa68 | |
parent | 8ea2d77a28374396cc21b2bb8c72e2b364563fe1 [diff] | |
parent | 0219efd6b9f6581e54c454d19d179a95c36d493e [diff] |
Merge "Insert DEFAULT_MGF1_DIGEST SHA-1 on MGF_DIGEST tag when ImportWrappedKey" into main am: 944f53581a am: 0219efd6b9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640452 Change-Id: I4199bcd6c7bfdbbeb025fd2bef0fdfcd32a8a95f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>