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:
Android Build Merger (Role)
2016-05-05 17:19:50 +00:00
committed by Android (Google) Code Review

Diff Content Not Available