tree 2f42ef6538ddc07e25c573d7992a4bd20f6bceda
parent f5db454865c7b8cff22cc8faaeb5b983f059cb73
parent f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4
author Narayan Kamath <narayan@google.com> 1390387811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390387811 -0800

am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."

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