tree dea991093f6ff3744515592c89f9c6818da28657
parent b13472da435e5a38ed0031a9a18e93051ff7e37e
parent b379c219a8d29c2dfa8778e5fb3da80856c30f7e
author Glenn Kasten <gkasten@android.com> 1363363258 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363363258 +0000

am 888498ec: am c44a3ae2: am f0cea9f8: Merge "Prevent invalid frame durations"

* commit '888498ec8f3c01e39bf0b202fbd926725d9d54a1':
  Prevent invalid frame durations