base

Merge change 24789 into eclair

* changes:
  	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java 	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java Fix the m4a1 duration and the also fix the random_seek time error in the stress test.