Merge "Create userdata.img with real data when SANITIZE_TARGET=address."

author Ying Wang <wangying@google.com>

Thu, 25 Jun 2015 21:29:48 +0000 (21:29 +0000)

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

Thu, 25 Jun 2015 21:29:52 +0000 (21:29 +0000)
author Ying Wang <wangying@google.com>
Thu, 25 Jun 2015 21:29:48 +0000 (21:29 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 25 Jun 2015 21:29:52 +0000 (21:29 +0000)
diff --cc core/Makefile
Simple merge
diff --cc tools/releasetools/build_image.py
Simple merge
author	Ying Wang <wangying@google.com>
	Thu, 25 Jun 2015 21:29:48 +0000 (21:29 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 25 Jun 2015 21:29:52 +0000 (21:29 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/build_image.py	patch \|	diff1 \|	diff2 \|	blob \| history