OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d512325 69ed330)
am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
authorJason Monk <jmonk@google.com>
Fri, 7 Aug 2015 18:47:06 +0000 (18:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 18:47:06 +0000 (18:47 +0000)
commit59769181a52cd7dc2da12ef324c6a2336540d627
tree568b5e39286dd85d09480218cbd9d0bb79fd5d9ctree | snapshot
parentd512325aaa89b03d7f0fccebb7d093324d95257dcommit | diff
parent69ed33087d77e32a1f1475adf00b9d87580960aacommit | diff
am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
  Allow system to disable lockscreen
services/core/java/com/android/server/wm/WindowManagerService.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help