Merge changes from topic 'file_contexts.bin'

author Nick Kralevich <nnk@google.com>

Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)
author Nick Kralevich <nnk@google.com>
Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)
diff --cc core/Makefile
Simple merge
diff --cc tools/releasetools/common.py
Simple merge
diff --cc tools/releasetools/ota_from_target_files.py
Simple merge
author	Nick Kralevich <nnk@google.com>
	Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/ota_from_target_files.py	patch \|	diff1 \|	diff2 \|	blob \| history