OSDN Git Service

Merge "Add support for locking the screen when the lid is closed"
authorMichael Wright <michaelwr@google.com>
Mon, 7 Dec 2015 23:19:53 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Dec 2015 23:19:53 +0000 (23:19 +0000)
commit4d9e6190b186f1d2e1cd25defd0d6e12dd833b38
tree99052c1fa1f8d927f075a417757f973b348ec526
parentff8ef28e73c0959a4993fea975d0bdefbc27a20b
parent9dc3c36c9cd796d90b65543567495d910d266e4c
Merge "Add support for locking the screen when the lid is closed"
am: 9dc3c36c9c

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