OSDN Git Service

Merge "Check if the given user is unlocked when unlock by token" into pi-dev
authorHongwei Wang <hwwang@google.com>
Wed, 21 Mar 2018 02:46:03 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Mar 2018 02:46:03 +0000 (02:46 +0000)
am: 764f123b97

Change-Id: I767426c2a920c448407ab799c4c7e77b54f6e461


Trivial merge