OSDN Git Service

am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
authorYing Wang <wangying@google.com>
Thu, 27 Aug 2015 01:38:15 +0000 (01:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 01:38:15 +0000 (01:38 +0000)
* commit '4fc1467949aaf9e6a49a6771ed996e3c2c702314':
  Don't fail build of otatools if there are no device certificates


Trivial merge