tree dda702111cc3ab7bfc5b8ae7f4102d198a6f717b
parent 341605d91d03c7ff88cac27070c6da309653dc13
parent 471c30892522f604b5b2953bbaeba7b2c4646ea8
author Brian Muramatsu <btmura@android.com> 1303337279 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303337279 -0700

am 471c3089: am e4c28cbd: am 82d2ffe2: Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread

* commit '471c30892522f604b5b2953bbaeba7b2c4646ea8':
  Revert "CTS: Fixes a possible "out of memory" exception"