Merge "	modified:   MediaPlayerStreamingTest.java" into ics-mr0