Merge "Honor TARGET_NO_RECOVERY flag."

author Tao Bao <tbao@google.com>

Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)
author Tao Bao <tbao@google.com>
Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)
diff --cc core/Makefile
Simple merge
diff --cc tools/releasetools/add_img_to_target_files.py
Simple merge
diff --cc tools/releasetools/ota_from_target_files.py
Simple merge
author	Tao Bao <tbao@google.com>
	Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/add_img_to_target_files.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/ota_from_target_files.py	patch \|	diff1 \|	diff2 \|	blob \| history