tree 028308f48889eea0737008f48ee06165bd5587a5
parent d27fb1090a228f6a5cb4300b1ac90b8b86891cad
parent 1ade004e0fd4e6c2c56dcb20ff0d923fe6410f6e
author Treehugger Robot <treehugger-gerrit@google.com> 1616116119 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616116119 +0000

Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f

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

Change-Id: Ibf882ed499ada52633ce22b88c1af931f9064ce3