OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cb8eccc
3b0450d
)
Merge "Unhide getKey() and importKey() and the whole class of RecoveryController...
author
Aseem Kumar
<aseemk@google.com>
Fri, 16 Mar 2018 22:51:56 +0000
(22:51 +0000)
committer
android-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