From: Ying Wang <wangying@google.com>
Date: Thu, 3 Apr 2014 01:51:19 +0000 (+0000)
Subject: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
X-Git-Tag: android-x86-6.0-r1~445^2~508
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=680e0370;p=android-x86%2Fbuild.git

am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."

* commit '59ff600927033db50ab4ef131ef198c686a5a65b':
  Unset _JAVA_OPTIONS before running "java -version".
---

680e037007fd0f4207a4734b8fccce17a91ee682