Merge "Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev am: 430df0fdb6 am: dca21d73ce" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
b36dacae37