OSDN Git Service

am 13d2fa50: am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
authorNick Armstrong-Crews <strongarm@google.com>
Tue, 8 Sep 2015 05:38:30 +0000 (05:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Sep 2015 05:38:30 +0000 (05:38 +0000)
* commit '13d2fa50b0815c63d2d289c27d8edacf1ace01eb':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.

1  2 
core/java/android/view/KeyEvent.java
core/res/res/values/attrs.xml
services/core/java/com/android/server/policy/PhoneWindowManager.java

Simple merge
Simple merge