Settings: UG translation.
patch set: white space

Change-Id: Ieecab9a96450552dcb47196eedf2d3899fcbc30c
Merge "Settings: UG translation. patch set: white space" into cm-10.2
NFC polling mode (2/3)

Change-Id: Ic46ede10fa91f02ca73daa12aa60098c8a52ceef

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java