From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 22 Jan 2009 08:16:13 +0000 (-0800)
Subject: Merge branch 'cupcake'
X-Git-Tag: android-x86-1.6~11
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Music.git;a=commitdiff_plain;h=fa0935a617742fe1545bb65202d2b93af8985b6a

Merge branch 'cupcake'
---

fa0935a617742fe1545bb65202d2b93af8985b6a