tree 80cf75ce8d0830052bf6e4b097fc62407a9ea08f
parent 0560b3d7482040b8501ac4ced58e7f3f761286f7
parent fe25658aafc7f19ae63a23bfb07d8a48f9747c2f
author Dianne Hackborn <hackbod@google.com> 1299722740 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299722740 -0800

am f49c3ae2: am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1

* commit 'f49c3ae2da7b6343088200bdafdf6e9906258bf4':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class