tree a7dc0f727830d6d0726056766e2a9516b5db5ba5
parent f4d8cac682dedcc6445faf1b29c12a1291e748e0
parent edb78620fbef1fa592407a5c6917b92c43a3ce7d
author Elliott Hughes <enh@google.com> 1446248229 +0000
committer android-build-merger <android-build-merger@google.com> 1446248229 +0000

Merge "adb: fix adb client running out of sockets on Windows" am: 1e2382a027
am: edb78620fb

* commit 'edb78620fbef1fa592407a5c6917b92c43a3ce7d':
  adb: fix adb client running out of sockets on Windows