| commit | 46b2664177521a11ee6f4c05a9aee2b516b8f4c3 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 20 20:45:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 20:45:32 2014 +0000 |
| tree | cbe93c4196ae3251ada2b69dd6d56cb482233554 | |
| parent | b876cae90d8e7e57a685e31cd3b347c325728823 [diff] | |
| parent | 7d09713c5198579c0855089a0a77328d4ec1dc36 [diff] |
am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev * commit '7d09713c5198579c0855089a0a77328d4ec1dc36': Verify certificates