Handle cancellation of the 'enabling PrivacyGuard' alert box.

I noticed that the option could remain ticked but not actually enabled
if the alert box is cancelled.

Change-Id: If9a4e88641a5e4283d6ea16c17ca4461841580e3
Settings : FR translation

-Add new translation
Patch set 2 : rebase and add new translation
Patch set 3 : rebase and add new translation
Patch set 4 : rebase and add new translation
Patch set 5 : rebase and add new translation

Change-Id: I5ffd8d73a47e1b9df5629875021aea992ed9d8b3
Settings: ES translations

Change-Id: If2d8a7bc620ae25a9d922c392413526e6e7ac36f
Merge "Settings: ES translations" into cm-10.1
Merge "Settings : FR translation" into cm-10.1
Merge "Handle cancellation of the 'enabling PrivacyGuard' alert box." into cm-10.1
Fix derp.

Change-Id: I2766f4c89460c967e32349be008e38b3600b7e76
Merge branch 'cm-10.1' into martincz
Settings: times changed

Change-Id: Ib2b1506884654a65ad0f8b74b9d0a6da769cc5e3
Settings: update Translations

Change-Id: Idee5da0ccf43e9413bb2a19e44264758de353803
Settings: check update

Change-Id: Ie50073803f8d4bf76c41bfa2bc69e22842a669ce
Settings: time change

Change-Id: Ic1e98c0145ca5064d6f279349ca439e2ff58ce18
Add option to hide music controls in lockscreen.

Change-Id: I736df60139f1b977838c16136c0c30198633fcb2
Settings: NL translation

ps1: Privacy Guard

ps2: QuickSettings: Camera tile

ps3: Add 2G/3G option to profile connections

ps4: Fix array

Change-Id: I4b8e8548130406b85ebd82b31ce0429d13458300
Settings: update v1 interface

Change-Id: I095493983d7b860e268140ced24583167d8a25b7
Settings: Update German translations

Patch Set 1:     * Add translation for electron beam enable/disable
Patch Set 2:     * Correct commit message
Patch Set 3:     * Add APN delete dialog
                 * Change wording
Patch Set 4:     * Add wake-up options
                 * Add Wi-Fi triggers
Patch Set 5:     * Add missing space
                 * Shorten some strings
Patch Set 6:     * Add BT triggers
                 * Add privacy guard
Patch Set 7:     * Add camera tile
                 * Add 2G/3G in profiles
Patch Set 8:     * Rewording

Change-Id: Ib33bde6313519aec042b70470df96196de660d4f
Add an option to allow a (subtle) notification vibration during calls.

Change-Id: I7dfbb64334e0e8e7f98d38bf503c053ff1880658
JIRA:CYAN-1550
Merge branch 'cm-10.1' into martincz
Merge "Settings: NL translation" into cm-10.1
Merge "Add an option to allow a (subtle) notification vibration during calls." into cm-10.1