tree 8d6ad956e9f1408fa9db2029b868bd2389bdfeaf
parent 232d05ca8b09bb5f0f3094e79001fba992544282
parent ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b
author Lajos Molnar <lajos@google.com> 1379525635 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379525635 -0700

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

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