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)
am: 5796ab29e6

Change-Id: Ib50cc7dd3e514321d4251cca1fb6fef8f9af13cd


Trivial merge