tree 8919e431ee00e5a466214f23d4a0998ad06fffcf
parent 8c70f9d05ac86551de20beb62ffefb5c3654584c
parent 0f4e0651e33bef8953f50082562de0ced41a8542
author Jean-Baptiste Queru <jbq@google.com> 1248580631 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1248580631 -0700

Merge korg/donut into korg/master

Conflicts:

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