am bb9fa8d7: fixed merge conflict with f39254e8779c9ed990ed8a728632f7956c27de7e
* commit 'bb9fa8d7ccd01c5b73cd5776909ddecb3536dbfe': (109 commits)
CameraHal: Add external gamma table configuration
USBCAMERA: Enable fps print.
Revert "CameraHal: V4LCameraAdapter: Add support for MJPEG"
Camera_test: Add support for UYVY reprocessing
CameraHal: Add support for UYVY reprocessing
Camera_test: Bayer reprocessing fixes
Camera_test: Reprocessing related updates
Camera_test: Add mechanism to explicitly set image streaming
CameraHal: Add support for reprocessing with buffer borders
CameraHal: Add error handling during frame callbacks
CameraHal: Further reprocess optimizations
CameraHal: Don't wait on preview frames during reprocess
CameraHal: Adds reprocess related PPMs
Camera: Set minimum undequeuable on tap-in
Camera_test: BQ: Always write cropped NV12
Camera_test: Fixes crop handling, locking of buffers
Camera_test: BQ: Add support for writing cropped
CameraHal: Improve performance when queuing shots
CameraHal: Fix back to back normal capture
CameraHal: OMX: Change shot queue flow
...
