tree d79a8a5509ad0dd3fd16f410c5111da32365a473
parent 0edefea88e975613bca9f0227614de91434ade11
parent 9dab78470592be7542b9c0f9090603ed0dc80949
author Yu Shan Emily Lau <yslau@google.com> 1300318846 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300318846 -0700

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