OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfb6b35 92d5dd3)
am 92d5dd36: (-s ours) am 49d6f604: am 71decb7b: Merge "Restriction pin changes."
authorJason Monk <jmonk@google.com>
Thu, 5 Dec 2013 22:45:11 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:45:11 +0000 (22:45 +0000)
* commit '92d5dd36f4445ee386560582514934135c9f98bd':


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