OSDN Git Service

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 52e1425...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 25 Apr 2016 17:28:47 +0000 (17:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 25 Apr 2016 17:28:49 +0000 (17:28 +0000)

Trivial merge