Sreeram Ramachandran
f1b21c5c73
Move netd_client into netd.
...
Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
2014-05-21 08:55:19 -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
The Android Automerger
2b83a2202b
merge in master-release history after reset to e14b37eb07
2014-05-21 05:51:08 -07:00
Todd Poynor
e14b37eb07
healthd: Add hooks for ENERGY_COUNTER property
...
Bug: 10118565
Change-Id: Ibabae2a78a600ae37ce9b91da0f5980ee94b05c2
2014-05-20 16:26:48 -07:00
Elliott Hughes
b65208d1a9
am f7a7e3c3: am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
...
* commit 'f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d':
Fix win32 undefined reference to `_socket_network_client_timeout'.
2014-05-20 20:18:01 +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
aceba829f1
am cbe7544a: am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9."
...
* commit 'cbe7544a3e848872def9cbf67110c78aa21d8ab1':
Address additional warnings found by GCC 4.9.
2014-05-20 18:22:55 +00:00
Elliott Hughes
fa59e0a487
am 9bcc5512: am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
...
* commit '9bcc55123ec814074417994db99730929a31fec8':
Fix win32 implicit declaration of function socket_network_client_timeout.
2014-05-20 18:15:58 +00: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
The Android Automerger
0ae3f71c37
merge in master-release history after reset to abcb99927d
2014-05-20 05:51:24 -07:00
Eric Laurent
abcb99927d
audio: add definitions for new audio devices
...
Change-Id: I7bbc564a81fd693fa7e6bcb3a817986b50568147
2014-05-20 01:05:01 +00:00
Elliott Hughes
5756d8873b
am 87d0f45b: am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."
...
* commit '87d0f45b3c30dff02bd92f542e5e9e64816f5315':
Fix Windows socket_network_client.c build failures.
2014-05-20 00:23:11 +00:00
Elliott Hughes
3edc25271f
am b42f1413: am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"
...
* commit 'b42f141315ae0929325335645d397db04a500c88':
Bound the ADB connect time with a non-blocking connect
2014-05-20 00:23:08 +00:00
Dan Albert
fbc5ca28c9
am c6112ca4: am 5b654f15: am 201bf676: Merge "Really fixes the ub branches"
...
* commit 'c6112ca4b8d0712fdd4c0ab3258d3ceaf2f8064e':
Really fixes the ub branches
2014-05-20 00:23:03 +00: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
917152b8cc
am 3f01965b: am 121f209d: am e1efe23f: Merge "Fix unbundled branches"
...
* commit '3f01965b3d1335ffff57e15fd47e5d99400dad3f':
Fix unbundled branches
2014-05-19 19:31:17 +00: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
Dan Albert
7ce29b5826
am e9b36f1a: am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"
...
* commit 'e9b36f1a9a280877cb130452c50af6a51360a203':
Adds libc++ versions of libbacktrace
2014-05-19 18:33:51 +00:00
Dan Albert
e9b36f1a9a
am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"
...
* commit '888f95e2e2dd4c56e4aba1785c77342ab4420186':
Adds libc++ versions of libbacktrace
2014-05-19 18:30:40 +00:00
Dan Albert
888f95e2e2
am f03bd953: Merge "Adds libc++ versions of libbacktrace"
...
* commit 'f03bd9537b77f996cddd562d88558151d3d6c7fd':
Adds libc++ versions of libbacktrace
2014-05-19 18:23:08 +00:00
Dan Albert
f03bd9537b
Merge "Adds libc++ versions of libbacktrace"
2014-05-19 18:19:08 +00:00
Dan Albert
40a46dde9c
Adds libc++ versions of libbacktrace
...
Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
2014-05-19 10:23:16 -07:00
The Android Automerger
6f72a62a8e
merge in master-release history after reset to bb8e90e87e
2014-05-19 05:50:24 -07:00
The Android Automerger
567a545550
merge in master-release history after reset to bb8e90e87e
2014-05-18 05:50:12 -07:00