| commit | a8e26b2e16f1bf800072194055ade22e1f1df4be | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Feb 23 18:33:52 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 23 18:33:52 2018 +0000 |
| tree | 9e5cd3ff01c398c78ea6817bbe58039c103c1b9d | |
| parent | 6dcc9de2feebf2130f15fefd7b096b221e91bbf8 [diff] | |
| parent | 239d74fa195fd047f66c9fd9f1d5ad1cdb4de62c [diff] |
Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b2c am: 94ec9e3e4b am: 239d74fa19 Change-Id: I19abbe828a0004888143be02fd6ca834d8013a64