am 9652870a: am 0c804176: Merge "Add local video tests." into gingerbread

* commit '9652870abb8917070724643831d40762cb8557ff':
  Add local video tests.