resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp

Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
2010-09-22 17:34:05 -07:00 · 2010-09-22 17:34:05 -07:00 · 67e0c2a6bd
parent 9f28f0d76e b368bba41c
commit 67e0c2a6bd
1 changed files with 1 additions and 1 deletions
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@ -3,7 +3,7 @@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ;
 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