tree 2d46e59da34527eefcba9f8ef0b26c8ff32ccc30
parent 5429cdc2c84bd753202897a7b3437a7fc522fd8b
parent da3eec42e11d9ebe1e08fc7e64c7edaf59c28272
author Ying Wang <wangying@google.com> 1395947282 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395947282 +0000

am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."

* commit 'da3eec42e11d9ebe1e08fc7e64c7edaf59c28272':
  Increase the maximum javac heap size.