halo

Conflicts:
	services/java/com/android/server/am/ActivityStack.java