OSDN Git Service

(root) / android-x86 / packages-apps-Music.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c70f9d 0f4e065)
Merge korg/donut into korg/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 03:57:11 +0000 (20:57 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 03:57:11 +0000 (20:57 -0700)
Conflicts:

res/values/strings.xml
src/com/android/music/MediaPlaybackService.java


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