tree 01207650ddf8ce4476b3c8640a239895941a141c
parent 0f217b52b42e8e8109440b80f43ffd38f1e9d54e
parent 60c6023902a0e163077b9c45b0cd938ddadff2e2
author Josh Gao <jmgao@google.com> 1522825812 -0700
committer android-build-merger <android-build-merger@google.com> 1522825812 -0700

Merge "adb: don't abort when connecting to the same address twice."
am: 60c6023902

Change-Id: I9fb8dd78288e4f5a3c6cc1ddb8a2cae8f2b81fce