OSDN Git Service
(root)
/
android-x86
/
hardware-interfaces.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
03ea749
a36cf1c
)
Merge "Test import of a EC P-521 key." into oc-dev am: ad40c6ccd7 am: 6715433ca7...
author
Shawn Willden
<swillden@google.com>
Fri, 23 Jun 2017 15:58:34 +0000
(15:58 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Jun 2017 15:58:34 +0000
(15:58 +0000)
am:
a36cf1c6a0
-s ours
Change-Id: I0e32b4709737dd4acb49e3fd33782a2cc046e2fe
Trivial merge