Merge branch 'cyanogenmod' into cm-10.1

Conflicts:
	P1Parts/AndroidManifest.xml
	P1Parts/res/values-es/strings.xml
	P1Parts/res/values-pt/strings.xml
	P1Parts/res/values-ru/strings.xml
	P1Parts/res/values-zh-rCN/arrays.xml
	P1Parts/res/values-zh-rCN/strings.xml
	P1Parts/res/values-zh-rTW/arrays.xml
	P1Parts/res/values/arrays.xml
	P1Parts/res/values/strings.xml
	P1Parts/src/com/cyanogenmod/settings/device/DeviceSettings.java
	P1Parts/src/com/cyanogenmod/settings/device/KeyLedBrightness.java
	P1Parts/src/com/cyanogenmod/settings/device/OverClockFragmentActivity.java
	P1Parts/src/com/cyanogenmod/settings/device/Startup.java
	P1Parts/src/com/cyanogenmod/settings/device/VibratorFragmentActivity.java
	P1Parts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java
	P1Parts/src/com/cyanogenmod/settings/device/WifiFragmentActivity.java
	overlay/packages/apps/Trebuchet/res/values/config.xml
Merge branch 'cm-10.1' of https://github.com/humberos/android_device_samsung_p1-common into twrp
p1-common: PT-BR update translations

Change-Id: Iabca57060ca1b3d9c76c24da560efc2d5db43259
Merge branch 'cyanogenmod' into cm-10.1
Merge branch 'cm-10.1' into twrp