tree 2a2f71003970bd151eb999f9c7c43fb8e59c3558
parent e7547e7221f1e2b2626f91984688642ea1649bff
parent 63563da85437667213fbc4aec765e56ab84354d9
author Andreas Huber <andih@google.com> 1365099438 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099438 -0700

am 63563da8: am fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev

* commit '63563da85437667213fbc4aec765e56ab84354d9':
  Fix adaptive frame rate handling to be non-adaptive unless specified through