Spanish translation / fixes
Settings: fix storage measurement for device without emulated sdcard

StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.

StorageVolumePreferenceCategory:
  - Always create mMountTogglePreference to avoid null pointer
    exception for code that relies on it existing
  - Check if the keys exist before calculating totalValues to
    avoid null pointer exception on storage where media is not
    calculated
  - For available/readonly, set title, not summary (summary is
    supposed to be the amount available)

Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
Settings: Forward port Hardware key custom rebinding (2/2)

Settings for rebinding the actions performed on the following key press events:
Home long-press, menu press, menu long-press, search press, search long-press,
app-switch press and app-switch long-press.

The available actions are: Nothing, open/close menu, recent apps switcher,
search assistant, voice search and in-app search.

Devices with a key configuration other than home, back, menu and search need to
set config_deviceHardwareKeys in an overlay to have the correct preferences
show up.

Change-Id: Id04a598aeb9829d7971dedbd171a61999ce2f919

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
Spanish translation and remove "restart launcher" option (framework fix found by CM)
QS/PW: Check for mobile data instead of telephony permissions (2/2)

For QuickSettings and Power Widget check if there is
ConnectivityManager.TYPE_MOBILE network avaialbe directly instead of relying
on a checking for the PackageManager.FEATURE_TELEPHONY permission.  Some
devices like tilapia (Nexus 7 GSM) has mobile data but does not set the
telephony permission.

Patchset 2:
	- Have power widget use the same logic as quicksettings to check for
	  mobile data

Change-Id: Ibe8059aaa5f3bd1e72e958608a34e89abfd0ad4a
Fixes: CYAN-803

Conflicts:
	src/com/android/settings/cyanogenmod/PowerWidget.java
	src/com/android/settings/cyanogenmod/QuickSettings.java
2g/3g toggle

Change-Id: I5dcace38de2631643bea62d908ced9e46db10205
Merge remote-tracking branch 'pa/jellybean' into sgs2

Conflicts:
	res/values/strings.xml

Change-Id: I55173da910ec5620a27f9217c98ef3b7d1d91102
Revert "Settings: Forward port Hardware key custom rebinding (2/2)"

This reverts commit 68a1992e18bca31714cf931da58e08b9cd2e4c6e.

Conflicts:
	res/values/strings.xml
	src/com/android/settings/paranoid/Toolbar.java

Change-Id: If8cfdeed3c44a379c81158d033a7a2cabe3f36ae
Squashed commit, Hardware key configuration and USB Mass Storage support.

Code for hw key configuration mostly based on CM and SlimBean commits.

Change-Id: I2332ecb68b34e486753a46e27464344ef2568b51
remove spanish translations, it isn't very complete with our version of key configuration anyway

Change-Id: Ib2fd609131a8cf48ef69c5a385919a618d3e6040