tree 441f2468dbb8fd9d3a334c78003e9ade79d99b69
parent 6344ffd4c944bab00539cd553c6d8fd6d66a4008
parent c1742e51378c3ec99a0e5df14dc0c77bcca0d16a
author Aseem Kumar <aseemk@google.com> 1521239257 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1521239257 +0000

Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev