OSDN Git Service

(root) / android-x86 / packages-apps-Music.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a813e57 2f70aee)
am 2f70aeeb: (-s ours) Revert "Passion feature 2179737: allow the "now playing" activ...
authorPaul Eastham <eastham@google.com>
Sun, 15 Nov 2009 22:53:45 +0000 (14:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Nov 2009 22:53:45 +0000 (14:53 -0800)
Merge commit '2f70aeeb516899a276a55432b02d989304e93a08' into eclair-mr2

* commit '2f70aeeb516899a276a55432b02d989304e93a08':
  Revert "Passion feature 2179737: allow the "now playing" activity to show without unlocking the phone."  DO NOT MERGE


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