commit | b533bfd6075de5b6ae8a26b1f4b34d12c213c4cb | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Wed Jan 22 02:50:11 2014 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 22 02:50:11 2014 -0800 |
tree | 2f42ef6538ddc07e25c573d7992a4bd20f6bceda | |
parent | f5db454865c7b8cff22cc8faaeb5b983f059cb73 [diff] | |
parent | f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4 [diff] |
am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." * commit 'f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4': Make envsetup.sh set JAVA_HOME correctly for java7.