OSDN Git Service

am 6d5b83d8: am b533bfd6: am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctl...
authorNarayan Kamath <narayan@google.com>
Wed, 22 Jan 2014 10:56:55 +0000 (10:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Jan 2014 10:56:55 +0000 (10:56 +0000)
* commit '6d5b83d82739ccedf50f778a06d965a61107980a':
  Make envsetup.sh set JAVA_HOME correctly for java7.


Trivial merge