tree 4eeff8496a740714145946cce9342275e96d169c
parent a82f8080cc4a81fa945b88683a4c77500311dee9
parent 97b4abf2f0521a72db7b01de3a88d43be249d611
author Andy McFadden <fadden@android.com> 1367531515 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367531515 -0700

am 97b4abf2: Merge "Adjust bit rate based on resolution" into jb-mr2-dev

* commit '97b4abf2f0521a72db7b01de3a88d43be249d611':
  Adjust bit rate based on resolution