resolved conflicts for merge of 554402f7 to master

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
2010-09-22 14:11:49 -07:00
parent fed45d859a 554402f76d
commit 1613f4ff1e
3 changed files with 4 additions and 4 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
-	exit 1
+        exit 1
    fi
    while [ -L $JAVAC ] ; do
        LSLINE=$(ls -l $JAVAC)