tree f7b321b1ab06dc07b86152be96a9873d25e352b2
parent 72f3418743fd2e920d42727440d1cf7f66a0da4f
parent 7aa9fb78e6636c301bb6c75c5e6e020e51552ba3
author Brian Muramatsu <btmura@android.com> 1301613967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301613967 -0700

am 7aa9fb78: Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread

* commit '7aa9fb78e6636c301bb6c75c5e6e020e51552ba3':
  CTS: Fixes a possible "out of memory" exception