| commit | 11df7aef41781705b6da618ed04d36091e50b1ba | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Sep 06 12:28:29 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 06 12:28:29 2011 -0700 |
| tree | 638b1d72f2bf1eea7e85c46cdeb17c4a1ea9f236 | |
| parent | e903eaf4186665cdf1d25f992d3201ae158a4448 [diff] | |
| parent | 8ecc24b7732428f2424b954d95cd9377fbdf80e3 [diff] |
am 8ecc24b7: (-s ours) resolved conflicts for merge of d3cb3af5 to gingerbread-plus-aosp * commit '8ecc24b7732428f2424b954d95cd9377fbdf80e3': Blacklist two additional DigiNotar intermediate CAs