OSDN Git Service

am 7d26e97e: am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
authorNarayan Kamath <narayan@google.com>
Wed, 30 Apr 2014 17:35:41 +0000 (17:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 17:35:41 +0000 (17:35 +0000)
* commit '7d26e97e7f7ecc8ee7af373d5a5e3c96d317c910':
  Use java_home to determine jdk location.


Trivial merge