| commit | 0aa2db4366a57d7a02bab788c348a21acb4476e8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 02 14:50:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 02 14:50:52 2012 -0700 |
| tree | a767d77ae7f7eb2d0603856a80d4a0b0157630c1 | |
| parent | 777d991cf3d0fd10c7d390c585d8962946cf28b8 [diff] | |
| parent | 2a2d5e0b31d8a4dafa7dc5c68a68debbe837b04d [diff] |
am 2a2d5e0b: (-s ours) Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp * commit '2a2d5e0b31d8a4dafa7dc5c68a68debbe837b04d': When we disconnect shutdown the StateMachine. DO NOT MERGE