tree 9cca2405219bb53ccef8d8af984532325c8749b4
parent 4232bd1c554b9df3596e9eb977e38b3181ddd8e0
author Paul Eastham <eastham@google.com> 1258320454 -0800
committer Paul Eastham <eastham@google.com> 1258325049 -0800

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

This reverts commit 0657c9efaa7146d5f2ab169ca46c48a22f64e893.
Seems to fix b/2261008, needed to get MR1 out the door.