galaxys2: advanced settings: fix jumping vibrator strength

Change-Id: I20b24aba4b5f3deffd3e627c43da0429d4b04d79
galaxys2-common: add/update resources

PS2: Merging time!

Change-Id: Idd18890c028acb90b111a5f79e886e3a0674ef3b
galaxys2-common: ES translations

- CABC

Change-Id: Idbe389ff472976f067d36553842dbc407cfe0bb9
Samsung galaxys2-common: FR translation

-Add new translation

Change-Id: I0fdb8a57dc8fa0910e09ba7d758fe87442d88cd7
galaxys2: use fimg

Change-Id: I450a2016c8f2c668e3a96e8ae09a36c76e542009
galaxys2-common: Set translatables

Change-Id: I5eb5ce554e33b5ac1db7f3c024ca7280af4d641c
galaxys2-common: PT-BR update translations

Change-Id: Ifdb28665d83c4f03831aaddad3263aa9016f9fba
DeviceSettings: HU translation update

PS2: Correcting typo
PS3: Correcting ...
PS4: Copyright

Change-Id: I7c939860a8bb3c8e7379da742884738b11b4e342
Revert "galaxys2: use fimg"

This reverts commit 5cce906553955d3ed4328b4d785cd572ebdf3456

Change-Id: I25178feaf07b8785e89e233a5151213f4e322066
Merge "Revert "galaxys2: use fimg"" into cm-10.1
galaxys2-common: NL translation

Change-Id: I5d1da701d455594ff53d0b8319ce65a46218ed1a
galaxys2: reenable fimg

Change-Id: I87d90d655fd82f2169f08afeda9d51de607fcab5
Galaxy S2 DeviceSettings: Update italian translation

PS3: Prepare for merging

Change-Id: Iaee3273b2920ebdf76b75ee6c831f72d246b3c43
Merge "galaxys2: reenable fimg" into cm-10.1
galaxys2: move libril, use SamsungExynos4RIL class

Change-Id: Idec0820fa46fabd0d4703fedef3e6b168b96e800
galaxys2: gps: add magic field to AGpsRefLocationCellID struct

Change-Id: I504efe60e3a0eecd2c77950b5bc8abe97b912685
galaxys2: add AGPS psc field

The GPS chipset used in the phone can use the Psc value for AGPS.
Rename field in AGpsRefLocationCellID struct and add a new define.

Credit to Qaweck from xda-developers forum for finding the meaning
of the field.

Change-Id: Ib917c3b0ebf3c4b0a683fc993ff41521a01b32d4
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_samsung_galaxys2-common into phablet-10.1

Conflicts:
	DeviceSettings/res/values-da/arrays.xml
	DeviceSettings/res/values-da/strings.xml
	DeviceSettings/res/values-de/arrays.xml
	DeviceSettings/res/values-de/strings.xml
	DeviceSettings/res/values-es/arrays.xml
	DeviceSettings/res/values-es/strings.xml
	DeviceSettings/res/values-fi/arrays.xml
	DeviceSettings/res/values-fi/strings.xml
	DeviceSettings/res/values-fr/arrays.xml
	DeviceSettings/res/values-fr/strings.xml
	DeviceSettings/res/values-hu/arrays.xml
	DeviceSettings/res/values-hu/strings.xml
	DeviceSettings/res/values-it/strings.xml
	DeviceSettings/res/values-nl/arrays.xml
	DeviceSettings/res/values-nl/strings.xml
	DeviceSettings/res/values-pl/arrays.xml
	DeviceSettings/res/values-pl/strings.xml
	DeviceSettings/res/values-pt-rBR/arrays.xml
	DeviceSettings/res/values-pt-rBR/strings.xml
	DeviceSettings/res/values-ru/arrays.xml
	DeviceSettings/res/values-ru/strings.xml
	DeviceSettings/res/values-zh-rCN/arrays.xml
	DeviceSettings/res/values-zh-rCN/strings.xml
	DeviceSettings/res/values/arrays.xml
	DeviceSettings/res/values/config.xml
	DeviceSettings/res/values/strings.xml
	DeviceSettings/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java
	libril/ril.cpp