OSDN Git Service

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)
commitf0f40832ff5cefe9fd2c32182d05ea94239d56d4
tree8919e431ee00e5a466214f23d4a0998ad06fffcf
parent8c70f9d05ac86551de20beb62ffefb5c3654584c
parent0f4e0651e33bef8953f50082562de0ced41a8542
Merge korg/donut into korg/master

Conflicts:

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