OSDN Git Service

Merge "Return null when user is locked" into nyc-dev am: 6eb8c15
authorFyodor Kupolov <fkupolov@google.com>
Mon, 25 Apr 2016 17:27:11 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:27:11 +0000 (17:27 +0000)
am: 52e1425

* commit '52e1425a650a169b851592680542b3f2200f4815':
  Return null when user is locked

Change-Id: Ied3f5c764cd84f3db3d5cd7608d81eee9722ece5


Trivial merge