back and forth...

cant seem to get anything to merge worth a piss except this ofcourse.

	new file:   docs/html/guide/practices/app-design/jni.jd
	new file:   docs/html/guide/practices/app-design/performance.jd
	new file:   docs/html/guide/practices/app-design/responsiveness.jd
	new file:   docs/html/guide/practices/jni.jd
	new file:   docs/html/guide/practices/performance.jd
	new file:   docs/html/guide/practices/responsiveness.jd
	new file:   docs/html/guide/practices/security.jd
	new file:   packages/QuickSettingsControlPanel/Android.mk
	new file:   packages/QuickSettingsControlPanel/QuickSettingsControlPanel.apk
	new file:   packages/SystemUI/QSCP/Android.mk
	new file:   packages/SystemUI/QSCP/QSCP.apk
	new file:   packages/SystemUI/res/drawable-hdpi/ic_lock_power_off.png
	new file:   packages/SystemUI/res/drawable-hdpi/ic_qs_location_off.png
	new file:   packages/SystemUI/res/drawable-hdpi/ic_qs_location_on.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_flashlight_off.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_flashlight_on.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_ring_off.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_ring_on.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_ring_vibrate.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_wifi_ap_off.png
	new file:   packages/SystemUI/res/drawable-hdpi/stat_wifi_ap_on.png
	new file:   packages/SystemUI/res/layout/quick_settings_tile_ringer.xml
	new file:   packages/SystemUI/res/layout/quick_settings_tile_screen.xml
	new file:   packages/SystemUI/res/layout/quick_settings_tile_torch.xml
	new file:   packages/SystemUI/res/layout/quick_settings_tile_volume.xml
	new file:   packages/SystemUI/res/layout/quick_settings_tile_wifiap.xml
	README.md
	modified:   core/java/android/provider/Settings.java