tree b0e989b61c370279a67c132252fb4d2255370467
parent f45076dd37a649c9bdf10aaf5bc42793c72b497d
parent 3f790d87838114a71bff96b4a0a51537ca879597
author Yu Shan Emily Lau <yslau@google.com> 1253864463 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253864463 -0700

am 3f790d87: Merge change 27011 into eclair

Merge commit '3f790d87838114a71bff96b4a0a51537ca879597' into eclair-plus-aosp

* commit '3f790d87838114a71bff96b4a0a51537ca879597':
  Added the checking for the wma in the memory test.