am 62430079: (-s ours) am 4e53b8aa: am 7799c2c0: am 97a79323: am ff01f6e3: (-s ours) am 5cefac4a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6243007922f8bc2b22ba8ab5aaa83ee9a58bf4be':
am 9628dd7f: auto-generated blob list

* commit '9628dd7fc037c6672109ba7e8554fd8d1cdd93d7':
  auto-generated blob list
am c72cb7b1: Use dumpstate directly for bugreports.

* commit 'c72cb7b11ac6f6977d4c09e20b738dafc47eebc8':
  Use dumpstate directly for bugreports.
am 9806b58f: Merge "Merge commit \'95274a40\' into manualmerge" into jb-mr2-dev

* commit '9806b58f3623c68e626f0be29848f81d6c73ca5c':
  mako: wifi: Channels blocking in no service - do not merge
am 4cf62751: (-s ours) am eb396b06: am 42bde9e9: am c36a280e: Merge "DO NOT MERGE JAPAN(440,441): 110,118,119,112,911" into jb-mr1.1-dev

* commit '4cf62751f6f6a83e9269e38ef129ffba04e585c6':
  DO NOT MERGE JAPAN(440,441): 110,118,119,112,911
am 75efd290: init.mako.rc: switch to new kickstarter driver

* commit '75efd2900127eaa3aa850b07487845679c963834':
  init.mako.rc: switch to new kickstarter driver
am c08d651d: mako: disable LGE\'s fast AF temporarily

* commit 'c08d651d17b40bf2e202bd060487ff96dd8e0185':
  mako: disable LGE's fast AF temporarily
am 52e510ec: mako: update WCNSS_cfg.dat

* commit '52e510eca3f1df3e1efe04efca23904a67d8f61b':
  mako: update WCNSS_cfg.dat
am 658692e1: mako: camera: featuring fast autofocus

* commit '658692e1ba6ff38e3aa7a6f1c7b81a9870964eae':
  mako: camera: featuring fast autofocus
am b7f574cf: am 7256507c: am 4329cd17: Merge "Remove unused lge/mako ARCH_ARM_HAVE_TLS_REGISTER."

* commit 'b7f574cfc1d1db2771684f3bd927dba664b1cecb':
  Remove unused lge/mako ARCH_ARM_HAVE_TLS_REGISTER.
am fbfec6b1: wlan: Enable ARP Offload

* commit 'fbfec6b11a023800177267732f729cba250c9519':
  wlan: Enable ARP Offload
am 2da1ded7: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2da1ded72203a915dfb441f661e39a2929236cef':
  wlan: Enable ARP Offload
  mako: update WCNSS_cfg.dat
am 846bd724: (-s ours) am 4325b9f9: am 4e7469c4: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '846bd72492f52b40994e6c2ebd37a808e262b139':
  DO NOT MERGE JAPAN(440,441): 110,118,119,112,911
  mako: wifi: Channels blocking in no service - do not merge
am 5279deef: am 2cbcbb45: Rename AOSP builds to aosp_*

* commit '5279deef13d60e2671535573be2728c433cbf1ee':
  Rename AOSP builds to aosp_*
am 7badbb00: am 1e73dcf3: Merge "auto-generated blob list" into jb-mr2-dev

* commit '7badbb00094c231a76cfbf7f75de1400c0d0d12a':
  auto-generated blob list
am 9877f6cd: am 6f478662: audio: enable loading ADSP image during bootup

* commit '9877f6cd82f0ebc173a893f8ad27bd09462b5f54':
  audio: enable loading ADSP image during bootup
am 407f0bd5: am 57d1b6c2: Merge "Mako: NFC: Modify config file to work with new stack." into jb-mr2-dev

* commit '407f0bd5e2fdb23ee0cbe33505a5bfc71827efa2':
  Mako: NFC: Modify config file to work with new stack.
mako: move camera HAL from hardware/qcom/camera

Change-Id: Ib76c01a8ce47dd17c4e5c986e5988c2ad1c61906
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge "mako: move camera HAL from hardware/qcom/camera"
mako: switch back to vendor/qcom and hardware/qcom for camera

Change-Id: I5e2d3c20105c572dbc03ab944d14993a55381246
Signed-off-by: Iliyan Malchev <malchev@google.com>