am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

* commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
  Add an option to include a full bootloader in incremental OTA.
This commit is contained in:
leozwang 2015-09-15 01:07:05 +00:00 committed by Android Git Automerger
commit 5837f1025c

View file

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

File diff suppressed because it is too large Load diff