Suspend Actions & Wakelock Blocker (2/2)

Change-Id: I3167307df0adfb393f1cb4bd81496bc5c71a7535
Fix expanded desktop crashes in 4th option due a array of 3 positions and not 4.

Change-Id: I47b075bbb6d393484090bce9417440329f1545ef
Settings: NL translations

Change-Id: I44ef0d7a63ddc8e0a6cb5f42c8af95e4b109996c
Settings: zh_CN translation

PS2: Trigger Cid

Change-Id: Iddf3736b7c8035e9757db9301ba8e497f22fe3ff
Settings: FR translation

PS2-3: correction

Change-Id: Ic940dd123805e576ac06d8b634d992b3ba4208b8

Conflicts:
	res/values-fr/cm_strings.xml
Settings: ES translations

- DUN support
- Multi-SIM support
- Gamma tunning header
- Reorganize some strings

Change-Id: I9b79e7336b16ec1cb823f40ada82a13cf2c8c229
Camera button support: useful features & bugfixes (2/2)

Screw the remapping, let's make something more useful!
Replaced the code to actually launch Camera app, not just fire the shutter.
I won't remove it: it's cool to have an option to double-click Home for Camera.
Added:
  * Camera wake (with button half-press) and unlock options
  * "Peek": releasing the half-pressed Camera button will
    turn the screen back off
  * Camera playback control

Change-Id: I711fe6b1a8d304b3d0ba9682a8757605992e1bde

Conflicts:
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/cyanogenmod/ButtonSettings.java
Merge branch 'cr-main-10.2' of https://github.com/cristianomatos/android_packages_apps_Settings into cm-10.2

Conflicts:
	AndroidManifest.xml