Merge "Adding support for the setFrameRate() API to SurfaceFlinger path"