OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6eb937b 52f3b7c)
am 52f3b7c3: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 20:50:23 +0000 (13:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 May 2013 20:50:23 +0000 (13:50 -0700)
* commit '52f3b7c3919a0ca35b4679b5227468efb1b4d459':


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