OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb2de9e 4325cf2)
am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 22:16:20 +0000 (15:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 22:16:20 +0000 (15:16 -0700)
* commit '4325cf22ef3d381bc9d28d264571ba305da94d57':


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