[Squashed] AppOpps
Privacy Guard Slim version (1/2)

Conflicts:
	core/res/res/values/ras_strings.xml
	core/res/res/values/ras_symbols.xml

start fixing build errors

Conflicts:
	services/java/com/android/server/power/DisplayPowerController.java

initialize mContext -- fix

update api