OSDN Git Service

am 63488bc7: am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchiev...
authorRonghua Wu <ronghuawu@google.com>
Tue, 14 Jul 2015 18:15:19 +0000 (18:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:15:19 +0000 (18:15 +0000)
* commit '63488bc788ac03adccc168f173337a51c0a86a6e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.


Trivial merge