tree 9bc35765dcf4d61d511c78318125e1ee3d6ff14f
parent c147019ab2fa078d8a2deae031b3efe92d6e123d
parent 5de808c5e246bc53f37dfdc7d318b371f23bd9e6
author Janis Danisevskis <jdanis@google.com> 1615479492 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615479492 +0000

Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccf99568c8238256addc02982a9b63757a7a22e