am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test...
am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread
* commit '8b570fd4':
MediaPlayer test cleanup + new streaming test placeholder.