Commit 1f8528cd authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge "MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting" into ics-mr1

parents 257944d6 c37a996d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment