tree a1da4a616d4ad3eab41082c5ff52249204072ef4
parent db372594bf27390d2bee089e35c5fb8f67370026
parent 4646d5756c06e896f9f8489fa07cd14f958b2f84
author Andreas Huber <andih@google.com> 1364335048 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364335048 +0000

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