tree 86ba49fd1b7275a7e293c3c3bc44e6317bebf67f
parent 232e3406f76b7ad2c869a3c10b498556dbcf747a
parent 3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97
author Tom Taylor <tomtaylor@google.com> 1400185589 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400185589 +0000

am 3fd19dba: (-s ours) Increase the java heap to 512M when running proguard

* commit '3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97':
  Increase the java heap to 512M when running proguard