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.