OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67d511e f83027c)
am f83027c2: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:44:55 +0000 (12:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Nov 2012 20:44:55 +0000 (12:44 -0800)
* commit 'f83027c29eeea639c5320ef4c209a8ecf98a092b':


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