OSDN Git Service

am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
authorYing Wang <wangying@google.com>
Thu, 3 Apr 2014 01:57:25 +0000 (01:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 01:57:25 +0000 (01:57 +0000)
* commit '680e037007fd0f4207a4734b8fccce17a91ee682':
  Unset _JAVA_OPTIONS before running "java -version".

1  2 
core/main.mk

diff --cc core/main.mk
Simple merge