Merge "Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev am: ca34ab06ec am: 3bb6351a4e" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-11 18:00:25 +00:00
committed by Android (Google) Code Review

Diff Content Not Available