am 4e2f1903: Merge "Clean up Javac a little bit."

author Ying Wang <wangying@android.com>

Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)

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

Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)
author Ying Wang <wangying@android.com>
Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)
diff --cc core/combo/javac.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/java.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)
		1	2
core/combo/javac.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java.mk	patch \|	diff1 \|	diff2 \|	blob \| history