tree ff925f630552939164e0582d08724b782890eef1
parent a18792bd0ec120724e329f065a2bab00e734c0c1
parent 079e3418c6401feebd420a65c00433f1b07f92c6
author Lajos Molnar <lajos@google.com> 1420776327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420776327 +0000

am 079e3418: am 9ad1ab51: media: VideoEncoderTest: fix bug introduced when setting input buffer size

* commit '079e3418c6401feebd420a65c00433f1b07f92c6':
  media: VideoEncoderTest: fix bug introduced when setting input buffer size