OSDN Git Service

Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev
authorBryce Lee <brycelee@google.com>
Tue, 13 Mar 2018 02:33:07 +0000 (02:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Mar 2018 02:33:07 +0000 (02:33 +0000)
commitfb7c1d1139a699c0ae6420d6f6c47863163aa6ea
tree6666915891c14d01affc73881632e21f54d1c069
parent4e5b10c5f01d680deb2058da2ef71bcc1f46db09
parent5796ab29e64a14ed03c21cf065ba231bd2e434f1
Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev
am: 5796ab29e6

Change-Id: Ib50cc7dd3e514321d4251cca1fb6fef8f9af13cd