OSDN Git Service

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


Trivial merge