diff options
author | Josh Gao <jmgao@google.com> | 2016-04-19 00:56:00 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 00:56:00 +0000 |
commit | 149f39c0aaa4bbe655874d3e7904ffe36005612a (patch) | |
tree | 0a8018559b0be632ca8c91928654ba334c0948e3 /init/builtins.cpp | |
parent | ab162d6cb20f79baed453a20bde4b0e4c87fc9d3 (diff) | |
parent | a9e818f4632eca67a5ffd1fb680d15550591ecd9 (diff) |
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
Diffstat (limited to 'init/builtins.cpp')
0 files changed, 0 insertions, 0 deletions