am 59778b3c: am db7ae10d: (-s ours) Remove STOPSHIP BT logging.

Merge commit '59778b3c19c52aed840ec2350b12f73cc05b92af' into eclair-mr2-plus-aosp

* commit '59778b3c19c52aed840ec2350b12f73cc05b92af':