tree dea281b68cbb9b22f33b764fe7f46650b27223d9
parent 3768ac8b7a7713c2dd1b7cdc70ddf760003d5e53
parent 6e5ea76da60c253dee7f07ecf3503ad43a0aff92
author James Dong <jdong@google.com> 1280525585 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280525585 -0700

am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread

Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c'

* commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c':
  Lower the lower bound for max file duration check