tree 436d4e389044465fe4235ebf22d4283e7f5e646e
parent 52bc363cf3a7de8431cfbb370f0fd3adeecaed52
parent 5035faba9a28f988291c4ff3d3cbf64d828f3f5a
author Marco Nelissen <marcone@google.com> 1395347794 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395347794 +0000

am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates