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

Browse Source

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

...

This commit is contained in:

Ying Wang

2015-08-27 01:46:10 +00:00

committed by Android Git Automerger

parent a522369718 f4ad2febdb

commit 27bc97e6e1

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

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

Diff Content Not Available