OSDN Git Service

Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev
authorFyodor Kupolov <fkupolov@google.com>
Fri, 13 May 2016 17:07:57 +0000 (17:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 May 2016 17:07:59 +0000 (17:07 +0000)

Trivial merge