OSDN Git Service

am 059a7ae1: am 2f70aeeb: (-s ours) Revert "Passion feature 2179737: allow the "now...
authorPaul Eastham <eastham@google.com>
Sun, 15 Nov 2009 22:59:15 +0000 (14:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Nov 2009 22:59:15 +0000 (14:59 -0800)
commitec4fc73ea04a5c95612492818425bd9f25ad7e9b
tree3c8d57d997432e0e8612c7ef3879c7b33b2fcb9f
parentd96643d64737483dd5a2571d2787bcea1de32397
parent059a7ae118b7c9d3799226e5d936ee927adff478
am 059a7ae1: am 2f70aeeb: (-s ours) Revert "Passion feature 2179737: allow the "now playing" activity to show without unlocking the phone."  DO NOT MERGE

Merge commit '059a7ae118b7c9d3799226e5d936ee927adff478' into eclair-mr2-plus-aosp

* commit '059a7ae118b7c9d3799226e5d936ee927adff478':