OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c888dbb 710e026)
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)
* commit '710e0265bc5f70398e7c070941ae6af34bf5c5d5':
  Fix java version detection when _JAVA_OPTIONS is set.


Trivial merge
build
About OSDN
Find Software
Develop Software
Help