Commit a8510ab0 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am dea0d8bb: (-s ours) Merge changes I34dbae75,I582afae6 into ics-mr0 

* commit 'dea0d8bb':
  Augment CTS test for MediaPlayer.setSurface
  DO NOT MERGE: Add CTS test for MediaPlayer.setSurface() For bug 5088394.
parents 29e73f2e dea0d8bb
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