From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 29 Jul 2009 21:57:06 +0000 (-0700)
Subject: merge from donut
X-Git-Tag: android-x86-1.6~3
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Music.git;a=commitdiff_plain;h=f38daf5f3c999660684f1585bd4dc11a1fdd0b83

merge from donut
---

f38daf5f3c999660684f1585bd4dc11a1fdd0b83