am 5b9e7632: (-s ours) am 994edbe9: am eb0df747: am c3879c0b: am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5b9e76325fd54607a5f34ddd32a93a2260180097':
am d2123587: camera: wrap fast AF enums around ifdef flags & drop camera 2.0 hal

* commit 'd212358747a5283d3d76ee2e4a451e0b88ff1538':
  camera: wrap fast AF enums around ifdef flags & drop camera 2.0 hal
am 86df0342: Camera: Clean up FAST_AF flags, move to msm_ion.h headers

* commit '86df03427cd33f7675adb615c31e88e3947551c4':
  Camera: Clean up FAST_AF flags, move to msm_ion.h headers
am bd9d1173: camera: use new ION APIs for cache operations.

* commit 'bd9d117352d1632fdc34719786a45c1ffe36ba42':
  camera: use new ION APIs for cache operations.
am 937320d6: camera: use new ION API.

* commit '937320d6969df597241af2d9acc74b1765e42ae2':
  camera: use new ION API.
am b274848d: Update copyright to The Linux Foundation

* commit 'b274848d051a4f2d5a9e7e3b152d26211c4b2e83':
  Update copyright to The Linux Foundation
camera: introduce USE_DEVICE_SPECIFIC_CAMERA

Do not compile hardware/qcom/camera when USE_DEVICE_SPECIFIC_CAMERA is set

Change-Id: I5eab0e3be11c0a88e90f6525cfe63b4d3ede6c92
Signed-off-by: Iliyan Malchev <malchev@google.com>
am ac6775da: (-s ours) camera: introduce USE_DEVICE_SPECIFIC_CAMERA, DO NOT MERGE

* commit 'ac6775da706c8c501f1068028262f3c5a4ae7f29':
  camera: introduce USE_DEVICE_SPECIFIC_CAMERA, DO NOT MERGE
am 6f83d735: qcom/camera: new camera HAL implementation

* commit '6f83d735d8e3b918da42e6b559fcd0efb78133e5':
  qcom/camera: new camera HAL implementation
am baf72fb0: Add liblog

* commit 'baf72fb053356fbf48e660c9a700fdb363571389':
  Add liblog
am 4faf945b: Camera2: Enable ZSL by default

* commit '4faf945bcfc04ead5b44da6468f8087618aa8741':
  Camera2: Enable ZSL by default
am a1724bc5: QCamera2: Trigger buffer cache clean invalidate just after dequeuing

* commit 'a1724bc599bec5b2fbe3f4a34d0eca2406ba4c5f':
  QCamera2: Trigger buffer cache clean invalidate just after dequeuing
am 2f073d4c: QCamera2: add support for video HDR

* commit '2f073d4cfa214187fc326377a1e0eecad84eaf3d':
  QCamera2: add support for video HDR
am 3f92cbaa: QCamera2: add supported livesnashot sizes for HFR

* commit '3f92cbaa5bde0dba1e4a9a67e5aa60fc0af2dfa0':
  QCamera2: add supported livesnashot sizes for HFR
am 6591d7fc: QCamera2: Adds invalidate cache op to the camera tests

* commit '6591d7fc4818d50ce096e781b14deda6903dbe57':
  QCamera2: Adds invalidate cache op to the camera tests
am d7315b73: Camera2: enable ov8825 compile on 8x26

* commit 'd7315b73a162da8c8d0562ea63197c0bd9dfebe6':
  Camera2: enable ov8825 compile on 8x26
am 3867dd81: camera: Fix deadlock issue during abort/fbd synchronization

* commit '3867dd81099cc6cb76f5a784ce78601df793209c':
  camera: Fix deadlock issue during abort/fbd synchronization
am b62b9fe1: QCamera2: disable reprocess temporarily

* commit 'b62b9fe1b51cc4b36a69ff46fa486ae92a908406':
  QCamera2: disable reprocess temporarily
am fbe69a7a: QCamera2: Add KPI performance log

* commit 'fbe69a7ac63f99c63d50d9abaed766c81d2aab13':
  QCamera2: Add KPI performance log
am fde009c2: QCamera2: fix bug for noDisplay mode stream buf allocation

* commit 'fde009c21f68cbf3562e68b88603730f9d416f3c':
  QCamera2: fix bug for noDisplay mode stream buf allocation