tree 819884ce42e1aa0d31c8f6c99cc37a4c20fbd28c
parent 46dc79cecf2daf1a0e1ec392c56fcb4f7c7a8eaf
parent f6ef828a7495be3bfe767ad0bb67ad155c6101de
author Ricky Wai <rickywai@google.com> 1460727892 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460727894 +0000

Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev