commit | cc78299968e7f8815dba58ae975f93d1c14992e9 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Wed Sep 06 13:13:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 06 13:13:55 2017 +0000 |
tree | db9a8f80980e47bec31da35e4da9300e3e71d775 | |
parent | d375476bda6226ce4c8ad57671114a7320161559 [diff] | |
parent | 93dac12f10c562dbda2483f1ac50a21b28f6e44c [diff] |
Merge "Keyguard: Don't show when booting to cryptkeeper" into oc-mr1-dev am: 89eceea5ca am: 93dac12f10 Change-Id: I1c80000d63c791f1901ea4f68e246ca8dd38b668