commit 3f4f0214c129aadab1e823bf17f174b7aa696ee4
author Yu Shan Emily Lau <yslau@google.com> Wed Mar 16 16:45:37 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 16 16:45:37 2011 -0700
tree b312ec0ba0224287ddcd2ab8314b5508cfb8e5ea
parent a8d32f7b24087f2d5842830a8f0672c1e66b57be
parent cf033b3f267b27039e1e8e64800d86d01787ad6a

am 797f5b0c: 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 '797f5b0c00895c21ff755ec7f6974e1d2e763b13':
  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