tree 69f2b294f468afb75999ab84c2fe1af61c0940a7
parent 7ca8108311be59adee5fcf30cf5d4285a4952e72
parent 62b031351a146d473dc73cee61dd1c4825db30c2
author Treehugger Robot <treehugger-gerrit@google.com> 1611866562 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611866562 +0000

Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." am: 4844c2065b am: 8fa4c0f37e am: 62b031351a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1beb7bbd7fcfa50428e0c6e1bde9e7485261a50f