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)
commit25fd0c9e74f1b59d8b49258a3081af4479574f3f
tree8dd53e4a33d384fc17eda0f3b4a134f4fe0f2202
parent2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2
parent53bcf2264cb8064bf7318d2cdc31155ae41b11f4
Merge changes Ib4450c39,Ie7ed5655

* changes:
  preloaded-classes: remove some OpenSSLCipher modes
  Add CertStoreParameters to preloaded-classes