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

Browse Source

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

...

This commit is contained in:

Ying Wang 2015-08-27 01:53:54 +00:00 committed by Android Git Automerger

parent 43aff506e3 27bc97e6e1

commit c586468d2e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available