From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 15 Nov 2009 23:10:20 +0000 (-0800)
Subject: am 9ebb4f21: merge from open-source master
X-Git-Tag: android-x86-2.2~90
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=061d274f17b66a4282a86d852a2361889d3e14d2;p=android-x86%2Fpackages-apps-Music.git

am 9ebb4f21: merge from open-source master

Merge commit '9ebb4f21806449ce031d0b17f7817f73db9d86a6'

* commit '9ebb4f21806449ce031d0b17f7817f73db9d86a6':
  Revert "Passion feature 2179737: allow the "now playing" activity to show without unlocking the phone."  DO NOT MERGE
  Import revised translations.  DO NOT MERGE
  eclair snapshot
---

061d274f17b66a4282a86d852a2361889d3e14d2