| commit | 44b0fe099dae10a9908194af0aebf2849adce785 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Oct 07 12:21:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 07 12:21:50 2010 -0700 |
| tree | da70318a4e98dc33f50927d8987f5cd1bba8b827 | |
| parent | 0a1b40977deb39a8559ae2f7cf7df6151ad5a715 [diff] | |
| parent | fc15fc0f9902bdecd1c535e6e06ea52669695fce [diff] |
am fc15fc0f: am 7b4e6828: Merge "Favor Harmony\'s CertificateFactory.X509 over BouncyCastle\'s" into gingerbread Merge commit 'fc15fc0f9902bdecd1c535e6e06ea52669695fce' * commit 'fc15fc0f9902bdecd1c535e6e06ea52669695fce': Favor Harmony's CertificateFactory.X509 over BouncyCastle's