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

merge from donut
---

e364234e302b3a99a9aba721696d92d61b06cc57