tree ebd08c379454e3064eb73207d60147d16406c2ad
parent dcc9dd24861afaa33c87d88a74547a5e84d569b9
parent a7cdea847152a3557aabe30c363414bf96f57558
author Dianne Hackborn <hackbod@google.com> 1299722573 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299722573 -0800

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

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