OSDN Git Service

Merge "Made sure to unlock the pending unlock if the user is being switched" into...
authorSelim Cinek <cinek@google.com>
Mon, 24 Jun 2019 21:33:44 +0000 (14:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Jun 2019 21:33:44 +0000 (14:33 -0700)
am: 3eec3dcd05

Change-Id: I3db748004d1468c90743d11df7267e2de84f97c9


Trivial merge