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

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

Merge commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331' into eclair-plus-aosp

* commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331':
  android-2.1_r1 snapshot
---

67bebd06dfa7b4f94520ea2623f1d76e2a28a186