am 616e2dac: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '616e2dac0f873f3fbeb0acfd674189eb83a937aa':
  Camera updates for RDI params and ION->ashmem fallback
am d487d218: am 46789ee5: camera: fix the problem camera get stuck in live snapshot

* commit 'd487d218facd6ce866be18f0aae988485baaede0':
  camera: fix the problem camera get stuck in live snapshot
am bb163741: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'bb163741507227deda63e4637b7017faaef5fe63':
am 14fc07bb: am eb414fab: Change condition to use TARGET_BOARD_PLATFORM

* commit '14fc07bbc833885519c876ed1e646ac581ce5374':
  Change condition to use TARGET_BOARD_PLATFORM
am 11ea8f64: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '11ea8f649d7dfb9dd2d2f713cf6f4214fca75deb':
am 832c3c3c: am d09006db: camera: enable CAF after taking picture

* commit '832c3c3cee9aa59377a0f1c507f038ae552d9713':
  camera: enable CAF after taking picture
am d2da3ffe: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd2da3ffe3e0860d9432961379953b0876638669e':
am 230363e6: am fece0433: camera: First pass attempt at reducing the logs from camera hal

* commit '230363e6bd40a64a10fe328e5603e6cb1046ad67':
  camera: First pass attempt at reducing the logs from camera hal
am d94ad6b4: am 0ac1f42d: camera: Mako camera hal upgrade

* commit 'd94ad6b445d2dfbb821caf905b82f67298493a6f':
  camera: Mako camera hal upgrade
am 20249896: am 184e988f: camera: Enable wavelet denoise

* commit '20249896c629d0590e75c7cc2269a251125a20b3':
  camera: Enable wavelet denoise
am ac245a23: am 83c4dfe6: camera: use msm_ion.h, not ion.h directly

* commit 'ac245a236bb04d904bb6014971966dd3e50ac275':
  camera: use msm_ion.h, not ion.h directly
am c08810ad: am 0bc9b7a8: camera: Enable HDR processing.

* commit 'c08810ad26c6380596469d72761b3278815f5a42':
  camera: Enable HDR processing.
am 9cbda643: am a46eb301: Camera: Initial release of camera 2.0 HAL.

* commit '9cbda6434199060b0519cc49b10ad08fe461a4d3':
  Camera: Initial release of camera 2.0 HAL.
am 48ceb7d4: am a5f4efed: camera: Enable ZSL mode for preview.

* commit '48ceb7d431578e5a430bed3aaefe7f52f897efe3':
  camera: Enable ZSL mode for preview.
am 3e404b43: am f9761fc5: Camera: Add HAL stub to match header change.

* commit '3e404b43b24e4a230a6d849d1aa7f48589868a60':
  Camera: Add HAL stub to match header change.
am f383cd89: am 576bf46a: camera: Fix the crash issue when switching to 5MP.

* commit 'f383cd89c6a0f8d27f6b333730a6b97d1a79f5c8':
  camera: Fix the crash issue when switching to 5MP.
am 9bf838bb: am 968e904f: Camera: Reduced log verbosity.

* commit '9bf838bbc6a3dcb3ba7d85add425b7fb0d581569':
  Camera: Reduced log verbosity.
am 19d73f8a: am ee2db3c3: camera: use low power mode as default

* commit '19d73f8a6365c91dc7cc9c11202c25aece1c1f60':
  camera: use low power mode as default
am f03bc066: am 8781c911: camera: increase q-factor to enhance image quality

* commit 'f03bc066af73bb1aea0538ae92e97db8d463a97c':
  camera: increase q-factor to enhance image quality
am f1aa084f: am f7bed851: camera: fix the problem flash does not work in ZSL mode

* commit 'f1aa084f421b90e15c56094acf02fe9d75fe6e37':
  camera: fix the problem flash does not work in ZSL mode