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)
commitd559bd176e4fc485ae611d8896c17644cccfc881
tree0d200dda7a57104dd62ee0704ed31cbfb53ef4de
parent5b258f6d3e0943e8aef5202be1b6d2d4944945de
parent764f123b97b77bc818d1500eb6167b3e1bc3997b
Merge "Check if the given user is unlocked when unlock by token" into pi-dev
am: 764f123b97

Change-Id: I767426c2a920c448407ab799c4c7e77b54f6e461