OSDN Git Service

am 2f70aeeb: Revert "Passion feature 2179737: allow the "now playing" activity to...
authorPaul Eastham <eastham@google.com>
Sun, 15 Nov 2009 22:53:55 +0000 (14:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Nov 2009 22:53:55 +0000 (14:53 -0800)
commit7b6b1072dbe6c371541c4ec8251146db17462511
tree9cca2405219bb53ccef8d8af984532325c8749b4
parentab2f09ad32c564c09d26b4c5dd1686525952c436
parent2f70aeeb516899a276a55432b02d989304e93a08
am 2f70aeeb: Revert "Passion feature 2179737: allow the "now playing" activity to show without unlocking the phone."  DO NOT MERGE

Merge commit '2f70aeeb516899a276a55432b02d989304e93a08' into eclair-plus-aosp

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