test

Change-Id: I0b759f26cbdbda3373ccfaf19fb6fa6831f2cedb

Conflicts:
	src/com/android/settings/slim/StatusBarNetSpeed.java
	src/com/android/settings/slim/quicksettings/QuickSettingsTiles.java
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java