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

Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
tree: 95818c6ea5f9e4988449d166bbec31251030b46e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/