| commit | 220cad6d9743f134c0d44623fc56cd57467866e7 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Jun 13 14:43:51 2014 -0700 |
| committer | Qiwen Zhao <zhao@google.com> | Fri Jun 13 14:43:51 2014 -0700 |
| tree | ef96c2022dae591f452e469490dc5ea433ca9798 | |
| parent | 2b3818e9a8915711af80f746a6373cbd4456595d [diff] | |
| parent | 0f3d3dd26c7c726752c92fbf92fb1502ba4b77f0 [diff] |
Merge commit '0f3d3dd2' Conflicts: services/core/java/com/android/server/am/ActivityStack.java services/core/java/com/android/server/am/ActivityStackSupervisor.java