Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f
Settings: Fix VoiceWakeup settings crash

The activity wasn't able to launch because
of this missing entry.

Change-Id: I7a3bee2ce047a27fe16975955b2263aeeb33b8a7
Signed-off-by: Roman Birg <roman@cyngn.com>
NFC polling mode (2/3)

Change-Id: Ic46ede10fa91f02ca73daa12aa60098c8a52ceef

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