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
Merge remote-tracking branch 'CM/cm-11.0' into gps