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: Update italian translation

	Add Privacy Guard and profile triggers
	to italian translation

Change-Id: I5dd10431872085a769bc692e27b2ab8a3e9b626b
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
fix the cm merge
wambobomb added hybrid
track wifitrigger
settings: Privacy Guard support

 * Add toggle to InstalledAppDetails to enable/disable privacy guard flag on
   a per-application basis.
 * Add toggle to enable privacy guard by default for applications.

Change-Id: If03aa5319c520b6c4a78887f0f46ef1443ddaa83
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
modd
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
add more hybridy
more hybridy