am f941b080: am 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev

* commit 'f941b0806ae2e1402fadba903006418a6a07c1a5':