am 50ad1d36: am 1ecd3dc4: Merge "Camera2/3: Properly disambiguate FPS range...
am 50ad1d36: am 1ecd3dc4: Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS setting" into klp-dev
* commit '50ad1d36':
Camera2/3: Properly disambiguate FPS range vs. single FPS setting