tree c4029a4116e31ed0dc1f474fb3ada92010282c1f
parent 12810de62c780e31d38b133a94ae41b235a4b646
parent 7d44fabece5f2d63a66ff2e44e330b77a6285e82
author John Grossman <johngro@google.com> 1346960153 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346960153 -0700

am 7d44fabe: am c56857b4: Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev

* commit '7d44fabece5f2d63a66ff2e44e330b77a6285e82':
  Fix calculations for an obscure combo of MPEG audio options.