OSDN Git Service

am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)
commitcecc62086a6ac7c17ce87d6fab1a4364b8d96cd7
treeb0a2c20c639a0095231e6913513a7637e24a6fb9
parent55371beb024ae402831898f8788e4293f52dd832
parent759445c5bdb2eb54af9e974f604226596976e078
am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '759445c5bdb2eb54af9e974f604226596976e078':
  Verify certificates