OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9f4f5d 110befc)
am 110befc2: (-s ours) do not merge: cherry-pick e9f4f5dd390973b46310a7cce08d1c6c56e6...
authorMichael Chan <mchan@android.com>
Fri, 14 Aug 2009 22:13:11 +0000 (15:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Aug 2009 22:13:11 +0000 (15:13 -0700)
Merge commit '110befc20e9be195a8c87339bc83c229f34a19a7'

* commit '110befc20e9be195a8c87339bc83c229f34a19a7':
  do not merge: cherry-pick e9f4f5dd390973b46310a7cce08d1c6c56e699c2 from master branch


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