OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 522de14 346f5a4)
am 346f5a48: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:46:34 +0000 (07:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 15:46:34 +0000 (07:46 -0800)
* commit '346f5a481b945251245429be649c005a0d9103ad':


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