Merge commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1' * commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
Merge commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1' * commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1': modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java