tree 31da42c8fe9bb0a0a40a3a1784ad2a0b7e6a0bc4
parent 737d3e5da366124d164555009fa5ee4552143cc8
parent b17cf207372268d91177de7efa692b2483785991
author Marco Nelissen <marcone@google.com> 1395338801 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395338801 -0700

am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates