OSDN Git Service

Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev
authorBryce Lee <brycelee@google.com>
Tue, 13 Mar 2018 01:44:52 +0000 (01:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Mar 2018 01:44:52 +0000 (01:44 +0000)

Trivial merge