OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5694cd0 c8cd7d9)
am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:01:50 +0000 (19:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 02:01:50 +0000 (19:01 -0700)
* commit 'c8cd7d9335863d19a0a37569a4a539f13ebd1858':


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