OSDN Git Service

Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c
authorMichael Wright <michaelwr@google.com>
Tue, 8 Dec 2015 10:55:07 +0000 (10:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Dec 2015 10:55:07 +0000 (10:55 +0000)
commit37c8bcbcc9f5098a2a7fde91a3b112abd35a85ad
treee7f344f1c73c5b489b6073b378fd5c33b92a9114
parent54909b8e6b45c913081df54496423bb35bd8955c
parent4d9e6190b186f1d2e1cd25defd0d6e12dd833b38
Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c
am: 4d9e6190b1

* commit '4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
  Add support for locking the screen when the lid is closed
core/res/res/values/symbols.xml
services/core/java/com/android/server/policy/PhoneWindowManager.java
services/core/java/com/android/server/wm/WindowManagerService.java