tree 60c36bb6eb2ac2b64f72d5e5e4a58fe1d1e2abf3
parent 8e98470c98f180478e0365dcbd1736f8d57bd24b
parent 24ce15826be9171100f751b7c8402e81ba34f7b0
author Lajos Molnar <lajos@google.com> 1420743845 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420743845 +0000

am 24ce1582: am d7639577: Merge "media: VideoEncoderTest: set input buffer size for playback" into lmp-mr1-dev

* commit '24ce15826be9171100f751b7c8402e81ba34f7b0':
  media: VideoEncoderTest: set input buffer size for playback