OSDN Git Service

am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct...
authorRonghua Wu <ronghuawu@google.com>
Wed, 29 Jul 2015 19:53:54 +0000 (19:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 19:53:54 +0000 (19:53 +0000)
* commit '9090d3c3d46f7c52fe744ddcd104578b6a5cc742':
  media: fix estimateFrameRatesFor to use correct ratio


Trivial merge