tree 7a77fcb961598570cd2335b718b0ffbf910ce2fe
parent a86fcc2980caa4ef7701d73610deba3ab94c984e
parent 33c98d9ab283913b7b76d8a33e138aafe9724d68
author Jean-Baptiste Queru <jbq@google.com> 1334081510 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334081510 -0700

am 33c98d9a: am 59d7372d: Merge "Bump DX Java heap to 2GB."

* commit '33c98d9ab283913b7b76d8a33e138aafe9724d68':
  Bump DX Java heap to 2GB.