OSDN Git Service

Merge "User action should only stop lock task mode if it is in pinned mode" into...
authorTony Mak <tonymak@google.com>
Tue, 19 Apr 2016 10:32:29 +0000 (10:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Apr 2016 10:32:33 +0000 (10:32 +0000)
commit882a0802a7f7268750b15adb8747dd3904f935b0
treecd77e71e27c1fb6cc7c2beada69d46f90dacbc17
parentbf8207e270b1af908278b7a58c33a3e16d425cac
parent2c11dc99632354836281cbe3000b911e72a30d14
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java