tree 557cb201abb84be8176662682e734deee25ef865
parent c5484969b4e52e027bd92adec3486cbc5dd7737d
parent 9cc7ad65a13b5d40566ea18be41a3c5a3610d4ab
author Ricky Wai <rickywai@google.com> 1462989032 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462989034 +0000

Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev