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:
a6e65d2
87cca29
)
am 87cca291: Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev
author
Alex Klyubin
<klyubin@google.com>
Wed, 13 May 2015 21:44:55 +0000
(21:44 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 13 May 2015 21:44:55 +0000
(21:44 +0000)
* commit '
87cca291bd70100522b62a28e7e6e433fcd49cc2
':
New AndroidKeyStore API in android.security.keystore.
Trivial merge