am 4dfda1fa: Merge "Remove Java 6 build support"

author Neil Fuller <nfuller@google.com>

Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)
author Neil Fuller <nfuller@google.com>
Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)
diff --cc core/config.mk
Simple merge
diff --cc core/main.mk
Simple merge
diff --cc envsetup.sh
Simple merge
author	Neil Fuller <nfuller@google.com>
	Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history