Settings: UMS [2/2]

Conflicts:

	src/com/android/settings/deviceinfo/Memory.java
	src/com/android/settings/deviceinfo/UsbSettings.java