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:37:54 +0000 (10:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 10:37:54 +0000 (10:37 +0000)
am: 882a080

* commit '882a0802a7f7268750b15adb8747dd3904f935b0':
  User action should only stop lock task mode if it is in pinned mode

Change-Id: Id2a1e5cfc512c352aaeb93f570a8f6c288a4ee3b


Trivial merge