am 6df89f2e: am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb

* commit '6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
  Expose average video frame rate via MPEG4Extractor
tree: 89d2f34ea0043d46369627203e272def71d821b1
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/