OSDN Git Service

am 9ebb4f21: merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 23:10:20 +0000 (15:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Nov 2009 23:10:20 +0000 (15:10 -0800)
commit061d274f17b66a4282a86d852a2361889d3e14d2
tree9e96d0ffa99c025195dd3e6eccd89df1a7c94fa2
parent9fc8704718c9d677cd4a8243a7f5e92f546572be
parent9ebb4f21806449ce031d0b17f7817f73db9d86a6
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