OSDN Git Service

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

* commit '5b99c7149fe4a642a5c1d2612ece5272a03e268a':

Change-Id: I9dd2b9c9a94818df541e9d2ea70c07647af1a234


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