tree bd356bcfb1e5b8d1f3321f07a8426f71ddc82a5b
parent 28ff83a9bd6c331fb29dac9f1b7905aec306f9b5
parent ec467110f23ad98630d4fd504d647ac70d78f279
author Lajos Molnar <lajos@google.com> 1379525796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379525796 -0700

am ec467110: am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev

* commit 'ec467110f23ad98630d4fd504d647ac70d78f279':
  Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value