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

Browse Source

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

...

This commit is contained in:

Ying Wang

2015-08-27 01:33:15 +00:00

committed by Android Git Automerger

parent 8f7c08ed62 fc168f8469

commit 4fc1467949

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