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:44:58 +0000 (20:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:44:58 +0000 (20:44 +0000)
commitbb4eb4a329f2c3457089f650cf92aa3991a9cabc
tree2d7b7cbb74db438835a22c814187cb517af87d49
parent73041c91e5ff1f8185a8cf2ff2ea3fb626e701a4
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