am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

Browse Source

* commit 'c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
  add otatools-package target

...

This commit is contained in:

Tao Bao

2015-08-25 23:30:14 +00:00

committed by Android Git Automerger

parent ca19158e03 c6e087adc4

commit afc5ab39d8

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