tree a1da4a616d4ad3eab41082c5ff52249204072ef4
parent 4eff193a405b576603be380f6e215e0a7bdf6f50
parent c9e58fcf57d865e6c82fdd4bf49d97f89203b2e4
author Andreas Huber <andih@google.com> 1364335156 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364335156 -0700

am 4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev

* commit '4fc3e841358164a661c78f78bc617f5ac879aa35':
  Adapt frame rate instead of keeping that constant and tweaking bitrate