tree fb6f51f36361bdc5430346b0c5746de320f39134
parent 6e796b2e490d422381211a790ab02ae54b0fff5f
parent c50c6651d388fada4c693d92f0e3bc93943262db
author Dianne Hackborn <hackbod@google.com> 1295484318 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295484318 -0800

am c50c6651: Merge "More memory!" into honeycomb

* commit 'c50c6651d388fada4c693d92f0e3bc93943262db':
  More memory!