Camera Wrapper: Only call cancel_auto_focus when the preview is enabled.

Change-Id: I2a26ba8bac3ef84f49ea5897cdeedbb5c0724e2b
msm8960: Unbreak network mode options

Change-Id: I3dcfedef08693587b0a1b35c45ef434797c0f32c
Merge "msm8960: Unbreak network mode options" into cm-11.0
msm8960: Modify 'roamingText3' for Network Extender support.

Change-Id: Ia0e4fe78f775654335f8715839c1db3844c3ffcb
camera: this is not just for d2 anymore

Change-Id: Ic6411156cf919c6fcc825405de95017ceffd55f8
msm8960-common: I don't want to see your face

Strengthen the prohibition against face detection as some third
party apps are ignoring it.

Change-Id: I88df1b40f27472b7ed40d745b4b5b59b6d2fa560
msm8960: Add fix for stupid preferred preview size bug

Change-Id: I793e497b103bdf23d612ac0a4cc6bdd00544c38f
Merge remote-tracking branch 'cm/cm-11.0' into kk4.4