OSDN Git Service

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)
commit059a7ae118b7c9d3799226e5d936ee927adff478
tree3c8d57d997432e0e8612c7ef3879c7b33b2fcb9f
parenta813e57206a8fbb2d36482d7d47aee682171ebcd
parent2f70aeeb516899a276a55432b02d989304e93a08
am 2f70aeeb: (-s ours) Revert "Passion feature 2179737: allow the "now playing" activity to show without unlocking the phone."  DO NOT MERGE

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