tree 8acc31d494248e508079d5deef7a786bdc767e6c
parent b7eb3901563f44b0a5997a6586a222c662e22220
parent 02022b70bef7d6964bc8043385531d1aa97fb15b
author Ronghua Wu <ronghuawu@google.com> 1438131650 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438131650 +0000

am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev

* commit '02022b70bef7d6964bc8043385531d1aa97fb15b':
  media: fix estimateFrameRatesFor to use correct ratio