| commit | 8f5c6949894ac0ccafa7371b4bb872abbfe41de9 | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Fri Apr 22 11:02:41 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 22 11:02:42 2016 +0000 |
| tree | 2360c3b6eaefd6974a3bbd3f3b00fcbcf0d03729 | |
| parent | b3146b007137f0a552025ed76e8619ad9d44c4f1 [diff] | |
| parent | f2e02db61e21f82431d7ef2a82010888b6792c27 [diff] |
Merge "Disable trust button when no screenlock is set" into nyc-dev