OSDN Git Service

am da0b2ce3: (-s ours) am 02022b70: Merge "media: fix estimateFrameRatesFor to use...
authorRonghua Wu <ronghuawu@google.com>
Thu, 27 Aug 2015 09:20:50 +0000 (09:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:20:50 +0000 (09:20 +0000)
commit7fc2ce36eac3f9244be1f0db2ae0551f4d25f3ff
tree715d547d2502de8d04de0ec12233b3183ce62c99
parenta00f8471748c0bdc6dfb14d71dd7b1fc02a8e67c
parentda0b2ce39ccc0eb2042cf601ff89883f67b4fa10
am da0b2ce3: (-s ours) am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev

* commit 'da0b2ce39ccc0eb2042cf601ff89883f67b4fa10':