tree 1daebe8f5b39109f8e862c0c5ec3dea3eba1204a
parent c5604b081b6cac558ed94dce88dedf1a467185b7
parent f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708
author Glenn Kasten <gkasten@android.com> 1363363030 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363363030 -0700

am f0cea9f8: Merge "Prevent invalid frame durations"

* commit 'f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708':
  Prevent invalid frame durations