commit | d2de83a9845e8cb615729b3b8044f6a9ace92f42 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Wed Jan 22 10:59:59 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 22 10:59:59 2014 +0000 |
tree | 42d457f6d3f5bfdd511554cbe36007f0cb5dc312 | |
parent | c6c21d06228ec2980fbaa4d0d58e22d172ee62da [diff] | |
parent | 5d7745dcb868ff56a7487ca55a904783dcc62936 [diff] |
am 5d7745dc: am 6d5b83d8: am b533bfd6: am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." * commit '5d7745dcb868ff56a7487ca55a904783dcc62936': Make envsetup.sh set JAVA_HOME correctly for java7.