Settings: Update German translation

Change-Id: I4f1a1a9897489fb69455a70217c9d49ae942952e
Settings: Minor values cleanup

Change-Id: If26d98b947b36bea19715f644e3e6308c0581121
Settings: Fix aapt zh-rTW warning

Change-Id: I5670efae7408f2046ea9df3b30b94106c116ce3f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Minor grammar nit-picking

Change-Id: I5b0a1921a343d9615e36b2524d90da5295dd2b3f
merge changes from CyanogenMod 10.2 into local branch
AppOps: Enable App Ops under security setting.

Add support for MODE_ASK mode and enable App Ops under security settings.

Change-Id: I7405f1e8639ca04cc2d7edac144f1738d13dc59f
AppOps: Add more operations in app ops settings.

Add following operations in app ops settings.

-- Wifi enable/disable
-- Bluetooth enable/disable
-- Mobile data enable/disable

Change-Id: I32183d77b88c326168557444a445765b5a69de6f
Add drag drop and swipe list class from SlimRoms

Change-Id: I6d7b3b3a345e076aadfa8ec99a55b61cdeae73b9
Settings: Notification Shortcuts [2/2]

Change-Id: I875355d19e4cdfdb6697de83ee19fbe0f5b77116
Fix Derps, add missing strings and arrays

Change-Id: I223f36bdc07fdbb61836a4b609c22d95922112f5
Remove duplicate array

Change-Id: Iee4c726de2c455f572f1d47848e52676b3068509
Merge "Settings: Update German translation" into cm-10.2
Merge "Settings: Minor values cleanup" into cm-10.2
Merge "Minor grammar nit-picking" into cm-10.2
Traffic meter: Selectable summary timeout [2/2]

Change-Id: I4f6f1c0fdfd52881b2805b9a5ed4049cdd7caaf4
AppOps: Enable App Ops under security setting

Add support for MODE_ASK mode and enable App Ops under security settings.

Change-Id: I7405f1e8639ca04cc2d7edac144f1738d13dc59f

Conflicts:
	res/values/cm_arrays.xml
Bluetooth: Security: Add Null check during pairing cancel intent.

Added null check, so before posing event we can restrict events,
if cached device list is empty

Change-Id: I458d181abe5eec2497b80b1713ddbc3502b79786
CRs-Fixed: 546364
Traffic meter: Add 1 and 2 seconds timeout

Change-Id: I122732bbf39e9b89e5b5756ea4878fab355365a1
merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	res/values/cm_strings.xml

Change-Id: I3785eb90fe763cba590e1405f566c25e15765ce1