Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624

author Colin Cross <ccross@android.com>

Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)

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

Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)
author Colin Cross <ccross@android.com>
Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)
diff --cc core/envsetup.mk
Simple merge
diff --cc core/main.mk
Simple merge
diff --cc envsetup.sh
Simple merge
author	Colin Cross <ccross@android.com>
	Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)
		1	2
core/envsetup.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history