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:
e8ef4af
f1654c6
)
am f1654c60: Merge "Add initial Keymaster 1.0 tests"
author
Chad Brubaker
<cbrubaker@google.com>
Fri, 13 Mar 2015 18:16:52 +0000
(18:16 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 13 Mar 2015 18:16:52 +0000
(18:16 +0000)
* commit '
f1654c6015dbf30b7dae3575d787ca141ae84028
':
Add initial Keymaster 1.0 tests
Trivial merge