OSDN Git Service

am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 20:36:34 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:36:34 +0000 (20:36 +0000)
commit7cd52895ec3e014c1097852725ba68646c1d6665
tree436d4e389044465fe4235ebf22d4283e7f5e646e
parent52bc363cf3a7de8431cfbb370f0fd3adeecaed52
parent5035faba9a28f988291c4ff3d3cbf64d828f3f5a
am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates