OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29eab21 467eb05)
am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into...
authorKenny Guy <kennyguy@google.com>
Wed, 13 May 2015 21:20:01 +0000 (21:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 May 2015 21:20:01 +0000 (21:20 +0000)
* commit '467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa':
  Allowing profile to set a subset of keyguard restrictions.


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