tree f3a9d2b48fd07f69e79c1736b75443e51de5f03d
parent 6b1eb9b22af554c7cf858b75ec25c9e26d25c6cd
parent 11df7aef41781705b6da618ed04d36091e50b1ba
author Brian Carlstrom <bdc@google.com> 1315518502 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1315518502 -0700

am 11df7aef: am 8ecc24b7: (-s ours) resolved conflicts for merge of d3cb3af5 to gingerbread-plus-aosp

* commit '11df7aef41781705b6da618ed04d36091e50b1ba':
  Blacklist two additional DigiNotar intermediate CAs