Commit 9e11d911 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "fix MediaPlayerTest.testVideoSurfaceResetting()" into jb-dev

parents 673cc33a 961d1f27
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