resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
diff --git a/core/config.mk b/core/config.mk
index e8eef81..3a068d8 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -269,8 +269,8 @@
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-5.0, \
- update 12 or higher, which you can download from java.sun.com)
+$(error Error: could not find jdk tools.jar, please install JDK-6.0, \
+ which you can download from java.sun.com)
endif
endif