summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 2a7ce0bc: am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on ↵Mark Salyzyn2014-05-221-5/+3
|\ | | | | | | | | | | | | -Werror"" * commit '2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b': Revert "libnetutils: Turn on -Werror"
| * am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""Mark Salyzyn2014-05-221-5/+3
| |\ | | | | | | | | | | | | * commit '9a12e952b3e765e03130ca1ab8bfe1b67d765e1b': Revert "libnetutils: Turn on -Werror"
| | * am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""Mark Salyzyn2014-05-211-5/+3
| | |\ | | | | | | | | | | | | | | | | * commit '5b7bb03ee84185bd83a594569264cc3841b80749': Revert "libnetutils: Turn on -Werror"
| | | * Merge "Revert "libnetutils: Turn on -Werror""Mark Salyzyn2014-05-211-5/+3
| | | |\
| | | | * Revert "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-211-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 249c26de823be0f9a84a9f092c776bcd9830fba5. Change-Id: I2a56c574fa8d842d5f3c51fd57ecf078838fcfec
* | | | | am d7465194: am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-221-3/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd746519443e37d7dde104779253830e92ae72c8e': libnetutils: Turn on -Werror
| * | | | am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-221-3/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2c0a7f6fd9145ce9499cd7c25f7f19ec6150c2ee': libnetutils: Turn on -Werror
| | * | | am d3cd08f8: Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-211-3/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'd3cd08f831be240342a2364160e5a537d3795f22': libnetutils: Turn on -Werror
| | | * | Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-211-3/+5
| | | |\ \ | | | | |/
| | | | * libnetutils: Turn on -WerrorMark Salyzyn2014-05-211-3/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
* | | | | am eb075e28: am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"Mark Salyzyn2014-05-211-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'eb075e28acff23804ef80d34cd08c5df9b1d583f': libdiskconfig: Turn on -Werror
| * | | | am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"Mark Salyzyn2014-05-211-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c8179498225dc44350c3addc932be97a9ef3a941': libdiskconfig: Turn on -Werror
| | * | | am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"Mark Salyzyn2014-05-211-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0': libdiskconfig: Turn on -Werror
| | | * | Merge "libdiskconfig: Turn on -Werror"Mark Salyzyn2014-05-211-0/+1
| | | |\ \ | | | | |/
| | | | * libdiskconfig: Turn on -WerrorMark Salyzyn2014-05-211-0/+1
| | | |/ | | | | | | | | | | | | Change-Id: Ic0f5871bd434fda78df79b1417f7bc610d99f73e
* | | | am b696bec3: am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"Colin Cross2014-05-211-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b696bec3541dc3091fb7c8764750f8ba21f64636': Modify VID for Compal
| * | | am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"Colin Cross2014-05-211-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '28c305183a6596eb3241771422d22351fbeaa9fb': Modify VID for Compal
| | * | am 1742b7d2: Merge "Modify VID for Compal"Colin Cross2014-05-211-1/+4
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '1742b7d218706c596e6b40c89a6660f30bdba022': Modify VID for Compal
| | | * Merge "Modify VID for Compal"Colin Cross2014-05-211-1/+4
| | | |\
| | | | * Modify VID for Compalherman_lin2014-05-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original definition of VENDOR_ID_COMPAL is for Compal Communications, Inc. But Compal Communications, Inc(CCI) had been merged into Compal Electronics, Inc(CEI) at April of 2014 So VENDOR_ID_COMPAL should be changed from 0x1219(CCI's VID) to 0x04B7(CEI's VID). And add one new definition(VENDOR_ID_COMPALCOMM) for CCI to maintain old devices that use CCI's VID. modified: adb/usb_vendors.c Change-Id: I9e9a96f6cc81273ff2c9353a13e7ce3b0583396b
* | | | | am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ac239a915b08823166657d6a3bfad094e57db0be': toolbox: fix x86 build
| * | | | am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '376aebdc9d92efed4928523227381ea18a4cb0cc': toolbox: fix x86 build
| | * | | am 76d057b9: Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '76d057b9708f92662a3002cffd55ecc05a860df4': toolbox: fix x86 build
| | | * | Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
| | | |\ \
| | | | * | toolbox: fix x86 buildGreg Hackmann2014-05-211-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"Greg Hackmann2014-05-212-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5d93823e557834c9b17771241ea6eecad74a5749': toolbox: fix build
| * | | | am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"Greg Hackmann2014-05-212-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '153c7aabdc1de609188ce2441442f985f75d4399': toolbox: fix build
| | * | | am 5eedd9d6: Merge "toolbox: fix build"Greg Hackmann2014-05-212-3/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3': toolbox: fix build
| | | * | Merge "toolbox: fix build"Greg Hackmann2014-05-212-3/+3
| | | |\ \
| | | | * | toolbox: fix buildGreg Hackmann2014-05-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | am 02c72357: (-s ours) am f8733c63: am 08c08f72: Merge "Move netd_client ↵Sreeram Ramachandran2014-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into netd." * commit '02c723579d0ee4e06da59cd58b579ff8ff76965e': Move netd_client into netd.
| * | | | | am f8733c63: am 08c08f72: Merge "Move netd_client into netd."Sreeram Ramachandran2014-05-215-269/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f8733c63aa7b7de8350264295a2c2c080b5307a4': Move netd_client into netd.
| | * | | | am 08c08f72: Merge "Move netd_client into netd."Sreeram Ramachandran2014-05-215-269/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '08c08f72617b13696049bf295646d6a68f3f1a8c': Move netd_client into netd.
| | | * | | Merge "Move netd_client into netd."Sreeram Ramachandran2014-05-215-269/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Move netd_client into netd.Sreeram Ramachandran2014-05-215-269/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f1b21c5c735e9150c8f29bdb52db2f3eb3ffc469) Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
* | | | | resolved conflicts for merge of faf84529 to masterMark Salyzyn2014-05-2127-85/+58
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
| * | | | am e2fb764c: am 36ccca15: Merge "toolbox: turn on -Werror"Mark Salyzyn2014-05-2127-84/+58
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e2fb764c3b1c3285bbc78f5e9a0c70785d2383f5': toolbox: turn on -Werror
| | * | | am 36ccca15: Merge "toolbox: turn on -Werror"Mark Salyzyn2014-05-2127-84/+58
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '36ccca155c03053397b953e4cc0ed8a8338d2450': toolbox: turn on -Werror
| | | * | Merge "toolbox: turn on -Werror"Mark Salyzyn2014-05-2127-84/+58
| | | |\ \
| | | | * | toolbox: turn on -WerrorMark Salyzyn2014-05-1427-84/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Deal with some signedness issues - Deal with some size issues - Deal with NULL pointer issues - Deal with some -Wunused issues Change-Id: I1479dd90d690084491bae3475f2c547833519a57
* | | | | | Move netd_client into netd.Sreeram Ramachandran2014-05-215-269/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
* | | | | | healthd: Add hooks for ENERGY_COUNTER propertyTodd Poynor2014-05-203-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10118565 Change-Id: Ibabae2a78a600ae37ce9b91da0f5980ee94b05c2
* | | | | | am f7a7e3c3: am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference ↵Elliott Hughes2014-05-203-18/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to `_socket_network_client_timeout\'." * commit 'f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d': Fix win32 undefined reference to `_socket_network_client_timeout'.
| * | | | | am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to ↵Elliott Hughes2014-05-203-18/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `_socket_network_client_timeout\'." * commit '6dfb039b0ba56576b4ed043e02ae43fb6afd42aa': Fix win32 undefined reference to `_socket_network_client_timeout'.
| | * | | | am 4a343436: Merge "Fix win32 undefined reference to ↵Elliott Hughes2014-05-203-18/+16
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `_socket_network_client_timeout\'." * commit '4a343436e01b07c21c043f8a903689f70000ca73': Fix win32 undefined reference to `_socket_network_client_timeout'.
| | | * | | Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."Elliott Hughes2014-05-203-18/+16
| | | |\ \ \
| | | | * | | Fix win32 undefined reference to `_socket_network_client_timeout'.Elliott Hughes2014-05-203-18/+16
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
* | | | | | am cbe7544a: am 7563a601: am 3816305b: Merge "Address additional warnings ↵Ben Cheng2014-05-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | found by GCC 4.9." * commit 'cbe7544a3e848872def9cbf67110c78aa21d8ab1': Address additional warnings found by GCC 4.9.
| * | | | | am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9."Ben Cheng2014-05-201-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '7563a601e47db0a7c429fff1776f8a17a6157ce0': Address additional warnings found by GCC 4.9.
| | * | | | am 3816305b: Merge "Address additional warnings found by GCC 4.9."Ben Cheng2014-05-201-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '3816305b58b0eeb098f2f989ef03208d1f29f4da': Address additional warnings found by GCC 4.9.
generated by cgit v1.1 at 2025-08-04 18:07:04 +0000