tree e637586c076f969fe59981e52f67b42d6534bb52
parent 93a81378d8f195b48327fe40c173661a75868c12
parent 47f1d4d509b271ddb2f158c761e572413f39f1a8
author Yu Shan Emily Lau <yslau@google.com> 1264642061 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264642061 -0800

am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair

Merge commit '47f1d4d509b271ddb2f158c761e572413f39f1a8'

* commit '47f1d4d509b271ddb2f158c761e572413f39f1a8':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.