tree a35fa2a73acca3ae50ee14e2b3c8aca3c9e09dab
parent 55f0bd93735c3fe3d1b403eeec79c1143849a5d1
parent 6b0441319a219fbc5296a81e9f653bd808cb095d
author Baligh Uddin <baligh@google.com> 1409955345 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409955345 +0000

am 6b044131: Merge "Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools" into lmp-dev

* commit '6b0441319a219fbc5296a81e9f653bd808cb095d':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools