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:57 +0000 (10:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 10:37:57 +0000 (10:37 +0000)
commit85c2982c3da07b06489374c0bf23f78ea20982ff
treeb52ca40afc6c2c2dfa82b4724d25aaf6b316738c
parent67922117fc7a54b9b32b990e40cc3ee2aab9178e
parent882a0802a7f7268750b15adb8747dd3904f935b0
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
am: 882a080

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

Change-Id: Ia6c098d03a028014632050f8edc790922fb13f35