am 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect or retry if detac...
authorWink Saville <wink@google.com>
Mon, 7 Oct 2013 00:10:53 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 00:10:53 +0000 (17:10 -0700)
commit8c9c5332766412bbb2561ea19c1147243f3fa0a4
treef901d7966b7259ab3caaee4eeb95967c3521d75d
parentcca7f8a4db05ab1d9a757cb48bb64f84b5156876
parent2f25f74592dcc0d13035f8adfdb90b7bc6a54e06
am 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.

* commit '2f25f74592dcc0d13035f8adfdb90b7bc6a54e06':
  Change DcTracker to not connect or retry if detached. DO NOT MERGE.