resolved conflicts for merge of 133415d5 to master

author Ying Wang <wangying@google.com>

Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)

committer Ying Wang <wangying@google.com>

Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)
author Ying Wang <wangying@google.com>
Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)
committer Ying Wang <wangying@google.com>
Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)
diff --cc core/Makefile
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)
committer	Ying Wang <wangying@google.com>
	Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history