OSDN Git Service

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

1  2 
envsetup.sh

diff --cc envsetup.sh
Simple merge