Mark Salyzyn
eb075e28ac
am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"
...
* commit 'c8179498225dc44350c3addc932be97a9ef3a941':
libdiskconfig: Turn on -Werror
2014-05-21 21:12:18 +00:00
Mark Salyzyn
c817949822
am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"
...
* commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0':
libdiskconfig: Turn on -Werror
2014-05-21 21:08:23 +00:00
Mark Salyzyn
2f62edf77d
Merge "libdiskconfig: Turn on -Werror"
2014-05-21 21:00:53 +00:00
Mark Salyzyn
42c79fe18b
libdiskconfig: Turn on -Werror
...
Change-Id: Ic0f5871bd434fda78df79b1417f7bc610d99f73e
2014-05-21 12:58:37 -07:00
Colin Cross
b696bec354
am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"
...
* commit '28c305183a6596eb3241771422d22351fbeaa9fb':
Modify VID for Compal
2014-05-21 19:32:15 +00:00
Colin Cross
28c305183a
am 1742b7d2: Merge "Modify VID for Compal"
...
* commit '1742b7d218706c596e6b40c89a6660f30bdba022':
Modify VID for Compal
2014-05-21 19:28:43 +00:00
Colin Cross
1742b7d218
Merge "Modify VID for Compal"
2014-05-21 19:24:53 +00:00
Greg Hackmann
ac239a915b
am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"
...
* commit '376aebdc9d92efed4928523227381ea18a4cb0cc':
toolbox: fix x86 build
2014-05-21 18:18:00 +00:00
Greg Hackmann
376aebdc9d
am 76d057b9: Merge "toolbox: fix x86 build"
...
* commit '76d057b9708f92662a3002cffd55ecc05a860df4':
toolbox: fix x86 build
2014-05-21 18:13:18 +00:00
Greg Hackmann
76d057b970
Merge "toolbox: fix x86 build"
2014-05-21 18:10:31 +00:00
Greg Hackmann
2122aac5c9
toolbox: fix x86 build
...
Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 11:04:32 -07:00
Greg Hackmann
5d93823e55
am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"
...
* commit '153c7aabdc1de609188ce2441442f985f75d4399':
toolbox: fix build
2014-05-21 17:49:28 +00:00
Greg Hackmann
153c7aabdc
am 5eedd9d6: Merge "toolbox: fix build"
...
* commit '5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3':
toolbox: fix build
2014-05-21 17:46:12 +00:00
Greg Hackmann
5eedd9d62f
Merge "toolbox: fix build"
2014-05-21 17:43:10 +00:00
Greg Hackmann
eeed45fa24
toolbox: fix build
...
Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 10:39:44 -07:00
Sreeram Ramachandran
02c723579d
am f8733c63: am 08c08f72: Merge "Move netd_client into netd."
...
* commit 'f8733c63aa7b7de8350264295a2c2c080b5307a4':
Move netd_client into netd.
2014-05-21 17:04:15 +00:00
Sreeram Ramachandran
f8733c63aa
am 08c08f72: Merge "Move netd_client into netd."
...
* commit '08c08f72617b13696049bf295646d6a68f3f1a8c':
Move netd_client into netd.
2014-05-21 17:01:39 +00:00
Sreeram Ramachandran
08c08f7261
Merge "Move netd_client into netd."
2014-05-21 16:59:51 +00:00
Sreeram Ramachandran
91dc3369d3
Move netd_client into netd.
...
(cherry picked from commit f1b21c5c73 )
Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
2014-05-21 09:26:57 -07:00
Mark Salyzyn
faf845290b
am e2fb764c: am 36ccca15: Merge "toolbox: turn on -Werror"
...
* commit 'e2fb764c3b1c3285bbc78f5e9a0c70785d2383f5':
toolbox: turn on -Werror
2014-05-21 15:46:39 +00:00
Mark Salyzyn
e2fb764c3b
am 36ccca15: Merge "toolbox: turn on -Werror"
...
* commit '36ccca155c03053397b953e4cc0ed8a8338d2450':
toolbox: turn on -Werror
2014-05-21 15:42:48 +00:00
Mark Salyzyn
36ccca155c
Merge "toolbox: turn on -Werror"
2014-05-21 15:40:14 +00:00
Elliott Hughes
f7a7e3c301
am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
...
* commit '6dfb039b0ba56576b4ed043e02ae43fb6afd42aa':
Fix win32 undefined reference to `_socket_network_client_timeout'.
2014-05-20 19:24:31 +00:00
Elliott Hughes
6dfb039b0b
am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
...
* commit '4a343436e01b07c21c043f8a903689f70000ca73':
Fix win32 undefined reference to `_socket_network_client_timeout'.
2014-05-20 19:21:36 +00:00
Elliott Hughes
4a343436e0
Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."
2014-05-20 19:18:11 +00:00
Elliott Hughes
0bff5bd952
Fix win32 undefined reference to `_socket_network_client_timeout'.
...
Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
2014-05-20 12:13:29 -07:00
Ben Cheng
cbe7544a3e
am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9."
...
* commit '7563a601e47db0a7c429fff1776f8a17a6157ce0':
Address additional warnings found by GCC 4.9.
2014-05-20 18:14:03 +00:00
Ben Cheng
7563a601e4
am 3816305b: Merge "Address additional warnings found by GCC 4.9."
...
* commit '3816305b58b0eeb098f2f989ef03208d1f29f4da':
Address additional warnings found by GCC 4.9.
2014-05-20 18:09:57 +00:00
Ben Cheng
3816305b58
Merge "Address additional warnings found by GCC 4.9."
2014-05-20 17:53:18 +00:00
Ben Cheng
43232920f3
Address additional warnings found by GCC 4.9.
...
Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
2014-05-20 10:51:02 -07:00
Elliott Hughes
9bcc55123e
am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
...
* commit '796b20157f75e46ad91b7d894796e0ba55a7766e':
Fix win32 implicit declaration of function socket_network_client_timeout.
2014-05-20 16:00:25 +00:00
Elliott Hughes
796b20157f
am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
...
* commit '51e27f955b79846e36097532a725f4b7a3eefef8':
Fix win32 implicit declaration of function socket_network_client_timeout.
2014-05-20 15:55:43 +00:00
Elliott Hughes
51e27f955b
Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
2014-05-20 15:52:59 +00:00
Elliott Hughes
b911cf0af4
Fix win32 implicit declaration of function socket_network_client_timeout.
...
Change-Id: Ic6070855a21920384c555c9c82b9a2e4a776cbae
2014-05-20 08:51:15 -07:00
Elliott Hughes
87d0f45b3c
am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."
...
* commit '2dea56e05c45c1a16232152dec239c2506ab6d97':
Fix Windows socket_network_client.c build failures.
2014-05-20 00:00:09 +00:00
Elliott Hughes
2dea56e05c
am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."
...
* commit '9e0a62487b9946c0403d6c4282010d28ae0b193e':
Fix Windows socket_network_client.c build failures.
2014-05-19 23:50:28 +00:00
Elliott Hughes
9e0a62487b
Merge "Fix Windows socket_network_client.c build failures."
2014-05-19 23:48:10 +00:00
Elliott Hughes
36739556db
Fix Windows socket_network_client.c build failures.
...
Change-Id: Ie67a2305ade02e078bf0edf54104c295b091b1b7
2014-05-19 16:47:12 -07:00
Elliott Hughes
b42f141315
am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"
...
* commit '0e71e3ab9cf66f41645ea286c7e62ed2b657ca38':
Bound the ADB connect time with a non-blocking connect
2014-05-19 23:26:22 +00:00
Elliott Hughes
0e71e3ab9c
am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"
...
* commit '9cae50b38d6a58efe0799ef3697f594cb4b100f9':
Bound the ADB connect time with a non-blocking connect
2014-05-19 23:22:21 +00:00
Elliott Hughes
9cae50b38d
Merge "Bound the ADB connect time with a non-blocking connect"
2014-05-19 23:18:49 +00:00
Ken Lierman
aecc6a6657
Bound the ADB connect time with a non-blocking connect
...
After a disconnect, the initial blocking connect takes
a long time to return, while subsequent calls return
quicks. Switch to a non-blocking connect to make the
re-connect time more consistent and faster overall.
Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd
Signed-off-by: Ken Lierman <ken.lierman@windriver.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
2014-05-19 16:16:42 -07:00
Dan Albert
c6112ca4b8
am 5b654f15: am 201bf676: Merge "Really fixes the ub branches"
...
* commit '5b654f15313f1ad27246269f6e34214ddb798405':
Really fixes the ub branches
2014-05-19 22:40:06 +00:00
Dan Albert
5b654f1531
am 201bf676: Merge "Really fixes the ub branches"
...
* commit '201bf6769fec1bb01446d25e6efad0bf10c39296':
Really fixes the ub branches
2014-05-19 22:37:29 +00:00
Dan Albert
201bf6769f
Merge "Really fixes the ub branches"
2014-05-19 22:34:06 +00:00
Dan Albert
ad51136267
Really fixes the ub branches
...
Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2
2014-05-19 14:49:13 -07:00
Dan Albert
3f01965b3d
am 121f209d: am e1efe23f: Merge "Fix unbundled branches"
...
* commit '121f209d3ea770109c9ebe0b6f8a965f91d5a2ef':
Fix unbundled branches
2014-05-19 19:28:03 +00:00
Dan Albert
121f209d3e
am e1efe23f: Merge "Fix unbundled branches"
...
* commit 'e1efe23ff718d25c5f3d5ef7914f05f8f739eee5':
Fix unbundled branches
2014-05-19 19:24:28 +00:00
Dan Albert
e1efe23ff7
Merge "Fix unbundled branches"
2014-05-19 19:21:37 +00:00
Dan Albert
a8b8460220
Fix unbundled branches
...
Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
2014-05-19 11:40:27 -07:00