resolved conflicts for merge of 67e0c2a6 to master
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
diff --git a/core/config.mk b/core/config.mk
index 51283ee..b283b8c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -271,7 +271,7 @@
else
HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
-$(error Error: could not find jdk tools.jar, please install JDK-6.0, \
+$(error Error: could not find jdk tools.jar, please install JDK6, \
which you can download from java.sun.com)
endif
endif