am 63488bc7: am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
am 63488bc7: am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev

* commit '63488bc788ac03adccc168f173337a51c0a86a6e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base