OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61ddf10 8543723)
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 01:59:04 +0000 (18:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 01:59:04 +0000 (18:59 -0700)
* commit '8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41':


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