OSDN Git Service

am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 20:45:32 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:45:32 +0000 (20:45 +0000)
commit46b2664177521a11ee6f4c05a9aee2b516b8f4c3
treecbe93c4196ae3251ada2b69dd6d56cb482233554
parentb876cae90d8e7e57a685e31cd3b347c325728823
parent7d09713c5198579c0855089a0a77328d4ec1dc36
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