tree 39d2bfc54edcef7f7d94c426641a0ae7c7f3037f
parent 92bc335785deffb9c9b62dea4c25639c4465c1fa
parent 41d04381e9abc0fac36f7172ca94a627a2f6f3cb
author Treehugger Robot <treehugger-gerrit@google.com> 1620874840 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620874840 +0000

Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 am: 41d04381e9

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

Change-Id: I3247db1b8db8691705a3a7856d696a84f0fd1413