tree c03f3ba8e229f7cc1464c38e228520aa93d36a24
parent c44510bb86c7f41d93eb1983befb33cf462e93a3
parent 3a5e2013a1296065a4674bdc43f357d3a352a6e9
author Xia Wang <xiaw@google.com> 1375743781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375743781 -0700

am 3a5e2013: am ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev

* commit '3a5e2013a1296065a4674bdc43f357d3a352a6e9':
  Add option for video playback test to accept media source path.