tree dff6f73d174c699e865ef37c9d40c1c82fd243c0
parent 30d2c50933d824dd299775fe791af052174d38f2
parent e10806de7aee2b0fc71f12a3528b8598c99516b4
author Dianne Hackborn <hackbod@google.com> 1295484473 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295484473 -0800

am e10806de: am c50c6651: Merge "More memory!" into honeycomb

* commit 'e10806de7aee2b0fc71f12a3528b8598c99516b4':
  More memory!