commit 797f5b0c00895c21ff755ec7f6974e1d2e763b13
author Yu Shan Emily Lau <yslau@google.com> Wed Mar 16 16:43:04 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 16 16:43:04 2011 -0700
tree e4f70f144d5a4a214a2fcbb76a8da0744be2b6f1
parent 69d05490345e96e1155e3b33eb5e36761b07a314
parent fd5c1f7c575451cf3566d1a8290b0b001bddfa39

am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1

* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6