Qiwen Zhao 220cad6d97 Merge commit '0f3d3dd2'
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-06-13 14:43:51 -07:00
..
2014-06-13 14:43:51 -07:00
2014-06-06 13:33:16 -07:00
2014-05-31 16:41:35 -07:00
2014-06-10 16:11:08 -07:00
2014-05-31 16:41:35 -07:00