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