OSDN Git Service

Merge changes Ib4450c39,Ie7ed5655
authorKenny Root <kroot@google.com>
Mon, 9 Dec 2013 22:28:59 +0000 (22:28 +0000)
committerGerrit 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