| commit | f12be074dc46fb137d36aa26da7e5669e48f7f68 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Sep 08 14:48:22 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 08 14:48:22 2011 -0700 |
| tree | f3a9d2b48fd07f69e79c1736b75443e51de5f03d | |
| parent | 6b1eb9b22af554c7cf858b75ec25c9e26d25c6cd [diff] | |
| parent | 11df7aef41781705b6da618ed04d36091e50b1ba [diff] |
am 11df7aef: am 8ecc24b7: (-s ours) resolved conflicts for merge of d3cb3af5 to gingerbread-plus-aosp * commit '11df7aef41781705b6da618ed04d36091e50b1ba': Blacklist two additional DigiNotar intermediate CAs