OSDN Git Service

Merge "Unhide getKey() and importKey() and the whole class of RecoveryController...
authorAseem Kumar <aseemk@google.com>
Fri, 16 Mar 2018 22:51:56 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Mar 2018 22:51:56 +0000 (22:51 +0000)
commit12c26fc509899ce6e3b0ea4637759218de4bbda6
tree4e5f25e83f553de67eece62b87efa63fe876c3e3
parentcb8eccc3455ed857f877f759b772ebc659eec2aa
parent3b0450d4a96b8caa24bb2ae0a8d29bfc1ff4e7d3
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
am: 3b0450d4a9

Change-Id: I650b80562b8e19d5264ec897f30145b5b393e77b