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

..

java/com/android/server

Merge commit '0f3d3dd2'

2014-06-13 14:43:51 -07:00

jni

Fixed a wrong path to HdmiPortInfo class

2014-06-13 14:46:17 +09:00

Android.mk

…