OSDN Git Service

am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 20:49:54 +0000 (20:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:49:54 +0000 (20:49 +0000)
commit113847c3f4e6774f991cfa9dcd73e9c53e26bd0e
tree5bb9c1b71d52a3a99c8927acbd5edb4df6b4160b
parentbb7fdd6e0a421ae31cf46002398a705235bb7916
parent46b2664177521a11ee6f4c05a9aee2b516b8f4c3
am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '46b2664177521a11ee6f4c05a9aee2b516b8f4c3':
  Verify certificates