[3/3] Settings: Add NFC polling setting

Change-Id: I1f715d9ab6b77cf4903e2bf5ef8310471c178309

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml

(cherry picked from commit a9b458d8ece6496f80a94ae3adf4781298e51ae0)

Conflicts:
	src/com/android/settings/WirelessSettings.java
Add fastscroll to the Manage applications screen

so you don't need to scroll so much if you have alot of apps
and want to go to the bottom of the list.

Change-Id: I96d892abf53a9da784ae1df056558d4fd3cf64f6
(cherry picked from commit 60bc7ec919b5c7a3acb461db8940c44c4149c761)
(cherry picked from commit 989857842559405df139f9507b41f0f3ac1c2d3d)

Conflicts:
	res/layout/manage_applications_apps.xml
Revert "Add CM Legal (2 of 2)"

This reverts commit 329dbbce5455f837493258a08d10feaa0ae9a3e8.

Conflicts:
	res/values/cm_strings.xml