From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 5 Feb 2010 22:18:17 +0000 (-0800)
Subject: am 67bebd06: am 0749a3f1: reconcile main tree with open-source eclair
X-Git-Tag: android-x86-2.2~40
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Music.git;a=commitdiff_plain;h=0224d7bf0d35a6409760339f1816880082cbb343

am 67bebd06: am 0749a3f1: reconcile main tree with open-source eclair

Merge commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186'

* commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186':
  android-2.1_r1 snapshot
---

0224d7bf0d35a6409760339f1816880082cbb343