tree 2701bf2337bd1a05df4b1c4e7cba3a27be5b4048
parent 43aff506e37bd29e5c1ba4f6c16b007665ff6c9f
parent 27bc97e6e14c663e5e55c6a934cc485cadbe9e33
author Ying Wang <wangying@google.com> 1440640434 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440640434 +0000

am 27bc97e6: am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev

* commit '27bc97e6e14c663e5e55c6a934cc485cadbe9e33':
  Don't fail build of otatools if there are no device certificates