Commit 5837f102 authored Sep 15, 2015 by leozwang Committed by Android Git Automerger Sep 15, 2015

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

* commit '1753b4e9':
  Add an option to include a full bootloader in incremental OTA.

tools/releasetools/ota_from_target_files

deleted120000 → 0

+1591 −1

Original line number	Diff line number	Diff line
		ota_from_target_files.py
		No newline at end of file