From: Jean-Baptiste Queru Date: Sun, 15 Nov 2009 22:06:43 +0000 (-0800) Subject: merge from open-source master X-Git-Tag: android-x86-2.2~40^2~20 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ab2f09ad32c564c09d26b4c5dd1686525952c436;p=android-x86%2Fpackages-apps-Music.git merge from open-source master Merge commit 'goog/stage-korg-master' into HEAD --- ab2f09ad32c564c09d26b4c5dd1686525952c436