| commit | a4c0b1de1a33219b4f8ef1cdfc4e7641ac246f4b | [log] [tgz] |
|---|---|---|
| author | Ricky Wai <rickywai@google.com> | Fri Apr 15 13:44:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 15 13:44:54 2016 +0000 |
| tree | 819884ce42e1aa0d31c8f6c99cc37a4c20fbd28c | |
| parent | 46dc79cecf2daf1a0e1ec392c56fcb4f7c7a8eaf [diff] | |
| parent | f6ef828a7495be3bfe767ad0bb67ad155c6101de [diff] |
Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev