OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ad9b8b 6eb8c15)
Merge "Return null when user is locked" into nyc-dev
authorFyodor Kupolov <fkupolov@google.com>
Mon, 25 Apr 2016 17:16:45 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:16:45 +0000 (17:16 +0000)
am: 6eb8c15

* commit '6eb8c15b7e07e320243fbb34999f4a34fa729ed0':
  Return null when user is locked

Change-Id: I7926a4226ce99d290ba60fff85b72f4a2f3cf6f3


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