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)
commit4caeaa44497ea7876dbfa6a750936fafa53222d0
tree96574cd631e0d9ffb4674132990f2010f5cfc139
parenta4b3107ba773874b6cbbf99250d425db2f80b331
parent7750ab39b2f08ac2cf49c50a6db557274bcced7a
Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4  -s ours am: 812594f573 am: 45bd03914c  -s ours" into oc-dev-plus-aosp
am: 7750ab39b2

Change-Id: Id41aad8e09009a52be5731de1679d154757c935f