OSDN Git Service

am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
authorNarayan Kamath <narayan@google.com>
Wed, 22 Jan 2014 10:50:11 +0000 (02:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Jan 2014 10:50:11 +0000 (02:50 -0800)
commitb533bfd6075de5b6ae8a26b1f4b34d12c213c4cb
tree2f42ef6538ddc07e25c573d7992a4bd20f6bceda
parentf5db454865c7b8cff22cc8faaeb5b983f059cb73
parentf99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4
am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."

* commit 'f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4':
  Make envsetup.sh set JAVA_HOME correctly for java7.