OSDN Git Service

am 113847c3: am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc620...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 20:57:08 +0000 (20:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:57:08 +0000 (20:57 +0000)
commit13a2639165c561c5b83ba4a0d66f9bfa038d3830
treefe85542872b6697fc3c04738c3a3e6e6bd6f9fb7
parentffb3e595cc4adbe0c31887e42e2200b77d93a024
parent113847c3f4e6774f991cfa9dcd73e9c53e26bd0e
am 113847c3: 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 '113847c3f4e6774f991cfa9dcd73e9c53e26bd0e':
  Verify certificates