resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp

author Dan Willemsen <dwillemsen@google.com>

Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)

committer Dan Willemsen <dwillemsen@google.com>

Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
author Dan Willemsen <dwillemsen@google.com>
Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
committer Dan Willemsen <dwillemsen@google.com>
Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
diff --cc core/config.mk
Simple merge
diff --cc core/envsetup.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
committer	Dan Willemsen <dwillemsen@google.com>
	Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/envsetup.mk	patch \|	diff1 \|	diff2 \|	blob \| history