tree c779c402d52c76791d464b9c3b3b73c2922259c5
parent da3d5afa2ba0e1999226995aaedf943963d6b48d
parent a1c06675dd2a83ce445f27b46cddab80f8c743e6
author John Reck <jreck@google.com> 1461941725 +0000
committer android-build-merger <android-build-merger@google.com> 1461941725 +0000

Merge "Video source test & bugfix" into nyc-dev
am: a1c06675dd

* commit 'a1c06675dd2a83ce445f27b46cddab80f8c743e6':
  Video source test & bugfix

Change-Id: I1fb6f399b64828dbff8ab6a01fef7d11b447d183