OSDN Git Service

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 41263bf...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 25 Apr 2016 17:28:05 +0000 (17:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 25 Apr 2016 17:28:11 +0000 (17:28 +0000)
commitf43cf5ea742568c34127c1e03e69efd6c550e9cc
tree21f92011abc7c35a094e1dcce84af73267ead73e
parent5a62a19ed57c1a00cd187d37f26fbe4a16fc69ae
parent0c9f87c8e8e3d5ed0b27bb8001562b48b9e07abb
Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 41263bf" into nyc-mr1-dev-plus-aosp