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)
am: 3b0450d4a9

Change-Id: I650b80562b8e19d5264ec897f30145b5b393e77b


Trivial merge