tree e09cad88a800dca43e8fd6cc198a259496197478
parent 1aa266c976c0389f308a0e3e4ddf3b4877864359
parent ed6d3307de029ce2555cdab0cf96b1e0064eda4e
author Romain Guy <romainguy@google.com> 1287195058 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287195058 -0700

am ed6d3307: Set max heap size to 32MB. Bug #3103119

Merge commit 'ed6d3307de029ce2555cdab0cf96b1e0064eda4e' into gingerbread-plus-aosp

* commit 'ed6d3307de029ce2555cdab0cf96b1e0064eda4e':
  Set max heap size to 32MB.