| commit | 89eceea5caf0a477450935ff593c658620a9bedc | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Sep 06 12:58:08 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 06 12:58:08 2017 +0000 |
| tree | 46b89187f6fe08faff40d4f00b4a7f6a969db96c | |
| parent | 2e21fba2b506e8b56fcc776853f3c314dc593ffb [diff] | |
| parent | ca8a216cf527c9a5a67e768cd31c39e7aefb1c64 [diff] |
Merge "Keyguard: Don't show when booting to cryptkeeper" into oc-mr1-dev