tree 89d2f34ea0043d46369627203e272def71d821b1
parent 761645bfdb5cb848380762491c0dde9f44027c7e
parent a027eaf8b23118354ffef89b40cc36bf93f1c769
author James Dong <jdong@google.com> 1295461978 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295461978 -0800

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

* commit '6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
  Expose average video frame rate via MPEG4Extractor