OSDN Git Service

Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 2 Jul 2012 21:48:28 +0000 (14:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 Jul 2012 21:48:28 +0000 (14:48 -0700)

Trivial merge