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:
2daa0c9
53bcf22
)
Merge changes Ib4450c39,Ie7ed5655
author
Kenny Root
<kroot@google.com>
Mon, 9 Dec 2013 22:28:59 +0000
(22:28 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Mon, 9 Dec 2013 22:29:00 +0000
(22:29 +0000)
* changes:
preloaded-classes: remove some OpenSSLCipher modes
Add CertStoreParameters to preloaded-classes
Trivial merge