OSDN Git Service

Merge "Unhide getKey() and importKey() and the whole class of RecoveryController...
authorAseem Kumar <aseemk@google.com>
Fri, 16 Mar 2018 22:27:37 +0000 (22:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Mar 2018 22:27:37 +0000 (22:27 +0000)
commit3b0450d4a96b8caa24bb2ae0a8d29bfc1ff4e7d3
tree441f2468dbb8fd9d3a334c78003e9ade79d99b69
parent6344ffd4c944bab00539cd553c6d8fd6d66a4008
parentc1742e51378c3ec99a0e5df14dc0c77bcca0d16a
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