| commit | ea18bdafb9e82a613f6b9b1f7ba4a9f1ea6c8b20 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Dec 09 18:24:24 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 09 18:24:24 2013 -0800 |
| tree | 084f6a7d51ef73bb4e6a04ef05e47459120251cd | |
| parent | 30253d7a649bd4fc6a436ae880a70e1142c1e58f [diff] | |
| parent | 25fd0c9e74f1b59d8b49258a3081af4479574f3f [diff] |
am 25fd0c9e: Merge changes Ib4450c39,Ie7ed5655 * commit '25fd0c9e74f1b59d8b49258a3081af4479574f3f': preloaded-classes: remove some OpenSSLCipher modes Add CertStoreParameters to preloaded-classes