| commit | 6d5b83d82739ccedf50f778a06d965a61107980a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Jan 22 10:53:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 22 10:53:43 2014 +0000 |
| tree | dfd0d3e196c49d42eb89b8e3273e4ad416070ac0 | |
| parent | a0d68280cae16645c2f16aeb6d8f614b76ba94a0 [diff] | |
| parent | b533bfd6075de5b6ae8a26b1f4b34d12c213c4cb [diff] |
am b533bfd6: am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." * commit 'b533bfd6075de5b6ae8a26b1f4b34d12c213c4cb': Make envsetup.sh set JAVA_HOME correctly for java7.