| commit | 13a2639165c561c5b83ba4a0d66f9bfa038d3830 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 20 20:57:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 20:57:08 2014 +0000 |
| tree | fe85542872b6697fc3c04738c3a3e6e6bd6f9fb7 | |
| parent | ffb3e595cc4adbe0c31887e42e2200b77d93a024 [diff] | |
| parent | 113847c3f4e6774f991cfa9dcd73e9c53e26bd0e [diff] |
am 113847c3: am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev * commit '113847c3f4e6774f991cfa9dcd73e9c53e26bd0e': Verify certificates