OSDN Git Service

am 710e0265: resolved conflicts for merge of f966bda4 to master
authorYing Wang <wangying@google.com>
Tue, 1 Apr 2014 01:29:41 +0000 (01:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 01:29:41 +0000 (01:29 +0000)
commitf596b1872acad07ee66b165b73f8dddd693994d7
tree4bb363adaf7a61b4236f4331cf4bc19fc8855fe7
parentc888dbbdb4312ec785855ee23e48d95a02f282c3
parent710e0265bc5f70398e7c070941ae6af34bf5c5d5
am 710e0265: resolved conflicts for merge of f966bda4 to master

* commit '710e0265bc5f70398e7c070941ae6af34bf5c5d5':
  Fix java version detection when _JAVA_OPTIONS is set.