OSDN Git Service

Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev
authorFyodor Kupolov <fkupolov@google.com>
Thu, 5 May 2016 17:14:49 +0000 (17:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 17:14:49 +0000 (17:14 +0000)
commitdca21d73ce59ac0b254e5e2a9ae976ed7d40060a
tree0b15433ca9a9f6867abc2aa4b87e00e4f613e17a
parent76dd05fc2a4fb08c0e91bdf269e747538a9cfd05
parent430df0fdb642847f1041756f94bf1483f7597f0c
Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev
am: 430df0fdb6

* commit '430df0fdb642847f1041756f94bf1483f7597f0c':
  Return from onUserUnlocked if user is no longer unlocked

Change-Id: Iea5f3874a3992bfdf7d1e6b82f65856ed69d03fd