resolved conflicts for merge of 554402f7 to master

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb

diff --cc core/config.mk
index e8eef81,24380d4..3a068d8
--- 1/core/config.mk
--- 2/core/config.mk
+++ b/core/config.mk
@@@ -268,10 -265,6 +268,10 @@@ ifeq ($(HOST_OS),darwin
  HOST_JDK_TOOLS_JAR :=
  else
  HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
- $(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)
 +ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
++$(error Error: could not find jdk tools.jar, please install JDK-6.0, \
++    which you can download from java.sun.com)
 +endif
  endif
  
  # It's called md5 on Mac OS and md5sum on Linux

diff --cc core/find-jdk-tools-jar.sh
index f21c48b,e772a15..ed0b127
--- 1/core/find-jdk-tools-jar.sh
--- 2/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@@ -3,7 -3,8 +3,7 @@@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ 
  else
      JAVAC=$(which javac)
      if [ -z "$JAVAC" ] ; then
 -      echo "Please-install-JDK-6.0,-which-you-can-download-from-java.sun.com"
--      exit 1
++        exit 1
      fi
      while [ -L $JAVAC ] ; do
          LSLINE=$(ls -l $JAVAC)

diff --cc core/main.mk
Simple merge