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