ScreenShot QuickTrash

Conflicts:
	core/res/res/values/symbols.xml
	packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
Fix conflicts with previous commit