tree fe886eb741a742dfa054b884b0def6cfec92d887
parent 217c81ec709f657bc2817b2083e400946b13e9d8
parent a82c3c631a9c0bb721e35d03714715ffe3b0b0c3
author Andreas Huber <andih@google.com> 1287005332 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287005332 -0700

am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread

Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp

* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
  Attempt to derive the avg. bitrate of the entire stream from metadata.