am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java...

author Ed Heyl <edheyl@google.com>

Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)

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

Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)
author Ed Heyl <edheyl@google.com>
Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)
diff --cc core/main.mk
Simple merge
diff --cc envsetup.sh
Simple merge
author	Ed Heyl <edheyl@google.com>
	Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)
		1	2
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history