OSDN Git Service

am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRa...
authorRonghua Wu <ronghuawu@google.com>
Wed, 29 Jul 2015 02:12:38 +0000 (02:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 02:12:38 +0000 (02:12 +0000)
* commit 'cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
  media: fix estimateFrameRatesFor to use correct ratio


Trivial merge