Adjust for AOSP
Change name of device settings from S3 to S4

Conflicts:
	msm8960.mk
upgrade to motox 4.4 adreno  release

Change-Id: I00007b26355637d3331eca7ff3b660503163fe3b
Add NFC host-based card emulation feature.

Change-Id: Ibe4b3cef46e3daede150925a4608108140872ce1
Merge remote-tracking branch 'cm/cm-11.0' into kk-4.4

Conflicts:
	DeviceSettings/Android.mk
	DeviceSettings/src/com/cyanogenmod/settings/device/HapticFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/SoundFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java
	configs/egl.cfg
Small update
MSM8960-common: enable the full BSP

Change-Id: I751c4bb5ab9be9336910fcd4cfc242ba6df7ff28
Enable 'Voice Earpiece Extra Gain' control
msm8960: CameraWrapper

* moved from d2-common and modified to support d2 and jf

Change-Id: I674bd4e27d9b5f239cec4e5356c330c16f11f325
d2/jf re-enable cancel_auto_focus

zsl cameras need this
https://github.com/CyanogenMod/android_packages_apps_Camera2/commit/110c926aca9918cdd2f30861be64a4497ef25b66

Change-Id: I47379f9c3327620ada1ce1e993179c8a5a04674a
msm8960-common: CameraWrapper Updates

* Possible Memory leak updates in fixed_set_params

* Update fixup_setparams in camerawrapper to support sending rawcommand
  At times it's needed to send raw commands to the camera.  Simple change
  to make it simple to pass these directly from the fixup_sendparams method.

Change-Id: I4e38a50a4a837c29f3561b0abee02f061b25de00
CameraWrapper: rework defines

* Set the various needed flags in device trees rather than checking
  device variant in the camera wrapper's makefile.
* Move checks after CLEAR_VARS. You know, so they actually work.
  As it urns out, you can't clear variables after setting them and
  expect them to work.
* Enable some magic for newer Samsungs. Need to send a magic command
  (1508) to the camera. Nobody knows what this number actually stands
  for. Well...maybe nishu does...

Change-Id: I90a83658e3e3178c4dc92aba885d2b991f7b3811
camera: don't disable autofocus based on zsl, use its own prop

Change-Id: I401bbe9347a1fbc3b839d7a1b17490d189785fa0
msm8960: camera: Only enable ZSL for photos

 * Don't turn on ZSL for camcorder unless you like pain.

Change-Id: I390843c3bbf6fff4caecd7477086e66eebe0205c
msm8960: Remove obsolete flags

Change-Id: Ic85bfe945fa9f1aded84ef7e31ab27569513810e
msm8960: camera: Add flag to disable face detection

 * This works fine on JF. Make it optional for the Derp2

Change-Id: I057446865af61f62db037c9c8d980ade8fd5a698
msm8960: camera: Use hw_get_module_by_class

 * And get rid of the libhardware hack too.
 * Camera blob is renamed to "camera.vendor.msm8960.so"

Change-Id: I64df0491661963452d042ecf85d6eb9feadf1211
apexqtmo/expressatt: fixup preview

apexqtmo and expressatt set incorrect preview sizes for video. Fix this
by setting proper preview sizes and add supported touch to focus modes.

Disable face detection on both cameras since we don't have it.

Change-Id: Id861b1c8d3ea07a82b60c405b05532f7207096f2
msm8960-common: camera: add missing ISO modes

Change-Id: I7217c376b8d240f001dc77405d06a74a9cf3da79
samsung krait: add msm8974 to build barrier

Change-Id: Ia5398a487463323650ee74016d973c7c6900b143