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:
d34b20e
ad48c4c
)
am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
author
Alex Klyubin
<klyubin@google.com>
Sat, 11 Apr 2015 02:45:17 +0000
(
02:45
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 11 Apr 2015 02:45:17 +0000
(
02:45
+0000)
* commit '
ad48c4c9c194d66dcc96e74e906825ca7b550e24
':
Add EcIesParameterSpec to enable ECIES crypto.
Trivial merge