Settings: "Vibrate during call" requires VOICE_CAPABLE

No need to have this option available if you are on a wifi-only
device.

Change-Id: I30e91be73b5dd058c35ca4f5316563fa63d30d1c
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
cmhw: Use hardware's default value for color enhancement

 * First boot should use the value read from sysfs rather than
   forcing the feature to be enabled.

Change-Id: Ibed5d8f3dc3644f972caf07853ca921c963dacfa
Settings: Create SAR level preference, allow overlay.

Change-Id: I1af616696702f72b8a6276b3b01e940d61735137
Automatic translation import

Change-Id: Iad2b03ee61730811d85b211e2bf10b37a5e07933
Settings: Improve AOSP JA translations

They translated "hotspot" as "アクセスポイント"(access point) but it just gets us confused.
"テザリング"(Tethering) is preferred than "アクセスポイント"(access point) in Japanese translation.
FYI, most vendors fixed these strings e.g. Samsung and Sony.

Change-Id: If9aeaddc1750d1f8432fa4e1cb2e2ffb41f74b0a
Settings: Set untranslatable

Change-Id: I0702378bab455a7ccf95a174e36bc792d26feec8
Fix upgrade to latest proguard

Change-Id: I3fc77adc895e98673005e89bb99a38744f01bb97
msim: Use the SIM operator to label the subscription

network operator is confusing, and downright misleading in roaming
cases

Change-Id: I3f645bbf1191f086ec0b6ca6cc8669915b2902a4
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	proguard.flags

Change-Id: I8b2e32ebdd50964c73773225d6ba55677317d21d
Build straight with crDroid info in "About phone" (3/3)

- Removed crDroid custom strings for build info and also the adition in device_info_settings.xml
- Use mod_version from CyanogenMod

Change-Id: I6122d6453bc219046693442a37102b500b3749a4
Revert "CM PlatLogo: CyanogenMod version preference (2/2)"

This reverts commit 3c4b17d6ac8ae7476dc95ba824da98092ea7e1fe.
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge pull request #4 from cristianomatos/cm-11.0

update