OSDN Git Service

Merge "Remember task which is being locked" into nyc-dev
authorAndrii Kulian <akulian@google.com>
Fri, 15 Apr 2016 04:32:55 +0000 (04:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Apr 2016 04:32:57 +0000 (04:32 +0000)
commit5981b8c2e8f6363d1f3bf09e7f1b3b5fb9a3846a
tree1909c5d8754e38038962407cc8b98f6fd8a5ae9b
parentff71d20ff357a33c30e1e3b474e51ad47d5c5d3a
parent0f051f5abdb31024d862a954cc4c4716b1dde616
Merge "Remember task which is being locked" into nyc-dev
core/java/android/app/ActivityManagerNative.java
core/java/android/app/IActivityManager.java
packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
services/core/java/com/android/server/am/ActivityManagerService.java