| commit | cb59b9889be18464ca3b9a78ea142c3bafdb289f | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Feb 04 11:29:37 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 04 11:29:37 2013 -0800 |
| tree | 440fe2257ad8a4d11cc68f4fc7152b7dc1e1f8d4 | |
| parent | 8d8898cca6a8e85ab5f3d1a4faa6af55a2912785 [diff] | |
| parent | 2d8d9ce072842c1c67e912686fd20795c43f221d [diff] |
am 2d8d9ce0: resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp # By Geremy Condra # Via Android Git Automerger (1) and others * commit '2d8d9ce072842c1c67e912686fd20795c43f221d': Add certs to blacklist.