OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 582b186 ee72f99)
am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
authorTim Kilbourn <tkilbourn@google.com>
Wed, 2 Sep 2015 17:40:36 +0000 (17:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 17:40:36 +0000 (17:40 +0000)
* commit 'ee72f99dd14c8e531cd1a114d162a49636e7b809':
  Allow shell to disable keyguard when not secure


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help