| commit | 5796ab29e64a14ed03c21cf065ba231bd2e434f1 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Tue Mar 13 01:44:52 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 13 01:44:52 2018 +0000 |
| tree | ae1187073bac8326f6f8e80455d4216d8603a235 | |
| parent | 0dba1eecd82f494d7c6577cc4a8e448bcbe010b1 [diff] | |
| parent | d939cf04e52b4f8e635989374e3bc47c3936aedc [diff] |
Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev