diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-09-01 14:51:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-01 14:51:39 -0700 |
| commit | aa628f4f6a528019a22d69e33a024fb2a24819ff (patch) | |
| tree | a550e28c5d438d4913f822199d440f37386284e4 | |
| parent | fd163e512fb25a4f75534ec765f7d066e5f8553b (diff) | |
| parent | 1e307dfd0eeca73d4cde1f55e91ee216f4a07eee (diff) | |
| download | bouncycastle-aa628f4f6a528019a22d69e33a024fb2a24819ff.tar.gz | |
am 1e307dfd: (-s ours) resolved conflicts for merge of c5f0a0c5 to gingerbread-plus-aosp
* commit '1e307dfd0eeca73d4cde1f55e91ee216f4a07eee':
Add Chrome-style public key blacklist to CertPathValidator
0 files changed, 0 insertions, 0 deletions