tree 5b4d7c5710b920009b764ffcb15ae4a7a4ee417b
parent b8310d431ff5ca29b605e1877ffb30a2177436b5
parent 5efcbae5998a1a4793e48a620b3b88cf04daeb54
author Wei Jia <wjia@google.com> 1459819770 +0000
committer android-build-merger <android-build-merger@google.com> 1459819770 +0000

Merge "GenericSource: send video input data to decoder in paused state." into nyc-dev am: 1cf582c
am: 5efcbae

* commit '5efcbae5998a1a4793e48a620b3b88cf04daeb54':
  GenericSource: send video input data to decoder in paused state.

Change-Id: I910f6dcd8d493a18f02cf95faf3f9fc71ea55dab