OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04c4b20 85c2982)
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:40:45 +0000 (10:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 10:40:45 +0000 (10:40 +0000)
am: 85c2982

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

Change-Id: I25eef7659032563d5cdf117fdbebf13113918f96


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help