OSDN Git Service

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


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