OSDN Git Service

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)
commita6e65d2ce7aa084732a592c71f4679f433efdc89
tree3e6cfcf92a2a88bf3736eaa64f60460b05fbc62d
parent29eab2155737da6f844430a10ce150800df4ccb6
parent467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa
am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev

* commit '467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa':
  Allowing profile to set a subset of keyguard restrictions.