am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

* commit 'fd5330c05716ef2bb697966dcde2886af331383d':
  Add an option to include a full bootloader in incremental OTA.
This commit is contained in:
leozwang 2015-09-15 01:32:49 +00:00 committed by Android Git Automerger
commit 89cd35ab82

View file

@ -1 +0,0 @@
ota_from_target_files.py

File diff suppressed because it is too large Load diff