resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index e772a15..f555576 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -3,7 +3,7 @@
else
JAVAC=$(which javac)
if [ -z "$JAVAC" ] ; then
- echo "Please-install-JDK-6.0,-which-you-can-download-from-java.sun.com"
+ echo "Please-install-JDK-6,-which-you-can-download-from-java.sun.com"
exit 1
fi
while [ -L $JAVAC ] ; do