tree 1d8dc2cbfdb3ce4f58d6e6b7f0882ba515dba35f
parent d387e08788f7f7e21c0f27bf18f27800efb78ce2
parent 8ad545297cdb180893c4f957682857953c0d3c5f
author Mathias Agopian <mathias@google.com> 1312241751 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312241751 -0700

Merge "connect/disconnect is now deprecated."