tree 0a8018559b0be632ca8c91928654ba334c0948e3
parent a5095285c0ab68e99ba39bdc32c08580cd6fd3e1
parent 9312f81ab07fb716f55de59cf8497ab31aef5849
author Josh Gao <jmgao@google.com> 1461027360 +0000
committer android-build-merger <android-build-merger@google.com> 1461027360 +0000

Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev
am: a9e818f463

* commit 'a9e818f4632eca67a5ffd1fb680d15550591ecd9':
  adb: increase the FD table size on Win32.
  adb: bump the server version to 36.
  adb: add reconnect command.

Change-Id: I69178c16e133dbf6a293e45f82de5481b0c014b9