OSDN Git Service

Merge commit '0f3d3dd2'
authorQiwen Zhao <zhao@google.com>
Fri, 13 Jun 2014 21:43:51 +0000 (14:43 -0700)
committerQiwen Zhao <zhao@google.com>
Fri, 13 Jun 2014 21:43:51 +0000 (14:43 -0700)
commit220cad6d9743f134c0d44623fc56cd57467866e7
treeef96c2022dae591f452e469490dc5ea433ca9798
parent2b3818e9a8915711af80f746a6373cbd4456595d
parent0f3d3dd26c7c726752c92fbf92fb1502ba4b77f0
Merge commit '0f3d3dd2'

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