commit | 63488bc788ac03adccc168f173337a51c0a86a6e | [log] [tgz] |
---|---|---|
author | Ronghua Wu <ronghuawu@google.com> | Tue Jul 14 15:59:16 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 15:59:16 2015 +0000 |
tree | 5f4a8a9e4598d6ccd05315af55b4a24d892ab33c | |
parent | b9384d5d549f602dc4c898a16e413ed0069df713 [diff] | |
parent | 16567cf24d796dd09c0ef325be10b1cd5f893f1d [diff] |
am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev * commit '16567cf24d796dd09c0ef325be10b1cd5f893f1d': media: Implement getAchievableFrameRatesFor with measured frame rate.