am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Merge commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a' into gingerbread-plus-aosp

* commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

envsetup.sh

@@ -1068,7 +1068,6 @@ function godir () {
 
 # Force JAVA_HOME to point to java 1.6 if it isn't already set
 function set_java_home() {
-    if [ "$STAY_OFF_MY_LAWN" = "" ]; then
     if [ ! "$JAVA_HOME" ]; then
         case `uname -s` in
             Darwin)
@@ -1079,7 +1078,6 @@ function set_java_home() {
                 ;;
         esac
     fi
-    fi
 }
 
 # determine whether arrays are zero-based (bash) or one-based (zsh)