tree 59372e5963718333acb053a6a06ad0136a6c0d80
parent 8365756bc7bcf8c3b38e678a896cedbb90e2a082
parent 7d49ae705e41ec120b2b9157861dd28db0513fa6
author Janis Danisevskis <jdanis@google.com> 1605141008 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605141008 +0000

Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I6c7bf795d40f6cb28d86b84bbe1162438322301c