OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63fc10d d5032cb)
am d5032cb5: am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning...
authorJason Monk <jmonk@google.com>
Mon, 3 Nov 2014 14:50:44 +0000 (14:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 14:50:44 +0000 (14:50 +0000)
* commit 'd5032cb5e6d591454902339b7af486d1a1e2edb8':
  Bring screen lock setting back to screen pinning


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help