OSDN Git Service

am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 20:41:54 +0000 (20:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:41:54 +0000 (20:41 +0000)
commit7d09713c5198579c0855089a0a77328d4ec1dc36
treefd0d83d50924fe5ec4edd1d446825bd757c82775
parentf92b00722d84fa0caea25a3363242b6dced0635c
parent7cd52895ec3e014c1097852725ba68646c1d6665
am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '7cd52895ec3e014c1097852725ba68646c1d6665':
  Verify certificates