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

Browse source

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

...

This commit is contained in:

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

parent d0cc11e898 4fc1467949

commit f4ad2febdb

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 is not available