OSDN Git Service

Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into...
authorAndrew Zeng <zenga@google.com>
Fri, 14 Apr 2017 20:18:39 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 20:18:39 +0000 (20:18 +0000)
am: 7750ab39b2

Change-Id: Id41aad8e09009a52be5731de1679d154757c935f


Trivial merge