tree 877270931d407d1d2914d090b68891feaa033ce8
parent 570ac7fbe97b022afe01b6bf5287ff7015f64687
parent a75737b0ae56dddefc5915f81c14a92b785b42d0
author Brian Muramatsu <btmura@android.com> 1301953391 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301953391 -0700

am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread

* commit 'a75737b0ae56dddefc5915f81c14a92b785b42d0':
  Clean Up VideoViewTest