Skip to content
Commit b91c52f7 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android Git Automerger
Browse files

am 8c937a17: Merge change 22379 into donut 

Merge commit '8c937a17' into eclair

* commit '8c937a17':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
parents 4e9718d6 8c937a17
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment