'Quicktile row option:set 3,4,5 tiles per row (2/2)'

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java