OSDN Git Service

(root) / android-x86 / packages-apps-Music.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fc8704 9ebb4f2)
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)
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


Trivial merge
packages/apps/Music
About OSDN
Find Software
Develop Software
Help