OSDN Git Service

am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is...
authorYing Wang <wangying@android.com>
Tue, 1 Apr 2014 00:15:50 +0000 (00:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 00:15:50 +0000 (00:15 +0000)
commitf966bda49f4fdf749c91b30e9819c85ca9dab063
tree34c0546e5c476d3a390797821e95bea1038f0a19
parentfc1a735ec618791df306ad2a8f2f94a3db10284d
parent4714d3d7a604391d174049a7a595e80ebab2da18
am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."

* commit '4714d3d7a604391d174049a7a595e80ebab2da18':
  Fix java version detection when _JAVA_OPTIONS is set.
core/main.mk