OSDN Git Service

am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
authorJason Monk <jmonk@google.com>
Mon, 3 Nov 2014 14:45:21 +0000 (14:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 14:45:21 +0000 (14:45 +0000)
commitd5032cb5e6d591454902339b7af486d1a1e2edb8
tree52b76d00cbe98e6fe06f5d36f339932a7bda2b0e
parentfb3781062c0828efb97209700c9c67f231d57bac
parent8f5c0e4660629546fb651e8bc739677a60ad3302
am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev

* commit '8f5c0e4660629546fb651e8bc739677a60ad3302':
  Bring screen lock setting back to screen pinning