ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9111 commits 1 branch 0 tags 217 MiB
Commit graph

9111 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Salyzyn
fd04f91dff am d7465194: am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror" 
* commit 'd746519443e37d7dde104779253830e92ae72c8e':
  libnetutils: Turn on -Werror
 2014-05-22 00:33:56 +00:00
Mark Salyzyn
d746519443 am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror" 
* commit '2c0a7f6fd9145ce9499cd7c25f7f19ec6150c2ee':
  libnetutils: Turn on -Werror
 2014-05-22 00:27:48 +00:00
Mark Salyzyn
2c0a7f6fd9 am d3cd08f8: Merge "libnetutils: Turn on -Werror" 
* commit 'd3cd08f831be240342a2364160e5a537d3795f22':
  libnetutils: Turn on -Werror
 2014-05-21 22:46:12 +00:00
Mark Salyzyn
d3cd08f831 Merge "libnetutils: Turn on -Werror" 2014-05-21 21:55:29 +00:00
Mark Salyzyn
d6a657c81d am eb075e28: am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror" 
* commit 'eb075e28acff23804ef80d34cd08c5df9b1d583f':
  libdiskconfig: Turn on -Werror
 2014-05-21 21:19:27 +00:00
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
Colin Cross
6fb1557fda am b696bec3: am 28c30518: am 1742b7d2: Merge "Modify VID for Compal" 
* commit 'b696bec3541dc3091fb7c8764750f8ba21f64636':
  Modify VID for Compal
 2014-05-21 20:49:01 +00:00
Mark Salyzyn
249c26de82 libnetutils: Turn on -Werror 
Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
 2014-05-21 12:58:37 -07: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
e12dd29755 am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build" 
* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
  toolbox: fix x86 build
 2014-05-21 18:20:55 +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
4dc379b59b am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build" 
* commit '5d93823e557834c9b17771241ea6eecad74a5749':
  toolbox: fix build
 2014-05-21 18:10:38 +00:00
Greg Hackmann
76d057b970 Merge "toolbox: fix x86 build" 2014-05-21 18:10:31 +00:00
Sreeram Ramachandran
f76d8a88a1 am 02c72357: (-s ours) am f8733c63: am 08c08f72: Merge "Move netd_client into netd." 
* commit '02c723579d0ee4e06da59cd58b579ff8ff76965e':
  Move netd_client into netd.
 2014-05-21 18:10:21 +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
Mark Salyzyn
6cd488e95a resolved conflicts for merge of faf84529 to master 
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
 2014-05-21 10:07:55 -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
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
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