summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "toolbox: turn on -Werror"Mark Salyzyn2014-05-2127-84/+58
|\
| * toolbox: turn on -WerrorMark Salyzyn2014-05-1427-84/+58
* | 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
|/ /
* | Merge "Address additional warnings found by GCC 4.9."Ben Cheng2014-05-201-1/+1
|\ \
| * | Address additional warnings found by GCC 4.9.Ben Cheng2014-05-201-1/+1
|/ /
* | Merge "Fix win32 implicit declaration of function socket_network_client_timeo...Elliott Hughes2014-05-201-0/+2
|\ \
| * | Fix win32 implicit declaration of function socket_network_client_timeout.Elliott Hughes2014-05-201-0/+2
|/ /
* | Merge "Fix Windows socket_network_client.c build failures."Elliott Hughes2014-05-191-1/+8
|\ \
| * | Fix Windows socket_network_client.c build failures.Elliott Hughes2014-05-191-1/+8
|/ /
* | Merge "Bound the ADB connect time with a non-blocking connect"Elliott Hughes2014-05-193-6/+75
|\ \
| * | Bound the ADB connect time with a non-blocking connectKen Lierman2014-05-193-6/+75
* | | Merge "Really fixes the ub branches"Dan Albert2014-05-191-1/+1
|\ \ \
| * | | Really fixes the ub branchesDan Albert2014-05-191-1/+1
|/ / /
* | | Merge "Fix unbundled branches"Dan Albert2014-05-191-0/+3
|\ \ \ | |/ / |/| |
| * | Fix unbundled branchesDan Albert2014-05-191-0/+3
|/ /
* | Merge "Adds libc++ versions of libbacktrace"Dan Albert2014-05-192-1/+46
|\ \
| * | Adds libc++ versions of libbacktraceDan Albert2014-05-192-1/+46
|/ /
* | Merge "Teach debuggerd the name of SIGTRAP."Elliott Hughes2014-05-172-13/+12
|\ \
| * | Teach debuggerd the name of SIGTRAP.Elliott Hughes2014-05-162-13/+12
|/ /
* | Merge "Remove the broken LED flashing code from debuggerd."Elliott Hughes2014-05-171-63/+2
|\ \
| * | Remove the broken LED flashing code from debuggerd.Elliott Hughes2014-05-161-63/+2
|/ /
* | Merge "Output correct gdbserver instructions from debuggerd."Elliott Hughes2014-05-171-14/+34
|\ \
| * | Output correct gdbserver instructions from debuggerd.Elliott Hughes2014-05-161-14/+34
|/ /
* | Merge "Fix host 64-bit build."Ying Wang2014-05-172-3/+4
|\ \
| * | Fix host 64-bit build.Ying Wang2014-05-162-3/+4
* | | Merge "Add SIGTRAP support to crasher and debuggerd."Elliott Hughes2014-05-172-2/+7
|\ \ \
| * | | Add SIGTRAP support to crasher and debuggerd.Elliott Hughes2014-05-162-2/+7
* | | | Merge "correct the setenv option judging condition"Colin Cross2014-05-161-1/+1
|\ \ \ \
| * | | | correct the setenv option judging conditionGavin.Chang2014-05-161-1/+1
|/ / / /
* | | | Merge "logd: logcat: debuggerd: auditd logs to events"Mark Salyzyn2014-05-165-49/+89
|\ \ \ \ | |_|/ / |/| | |
| * | | logd: logcat: debuggerd: auditd logs to eventsMark Salyzyn2014-05-155-49/+89
* | | | Merge "init: logd: Allow Developer settings to adjust logd size"Mark Salyzyn2014-05-163-9/+63
|\ \ \ \
| * | | | init: logd: Allow Developer settings to adjust logd sizeMark Salyzyn2014-05-133-9/+63
* | | | | Merge "libadf: silence false positive warning"Greg Hackmann2014-05-151-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | libadf: silence false positive warningGreg Hackmann2014-05-071-1/+1
* | | | | Merge "Change app_process reference to app_process32."Narayan Kamath2014-05-151-1/+1
|\ \ \ \ \
| * | | | | Change app_process reference to app_process32.Narayan Kamath2014-05-141-1/+1
* | | | | | Merge ""stop" / "start must apply to the secondary zygote as well."Narayan Kamath2014-05-152-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | "stop" / "start must apply to the secondary zygote as well.Narayan Kamath2014-05-132-0/+2
* | | | | | Merge "ps: add flag to show ABI"Kenny Root2014-05-151-4/+47
|\ \ \ \ \ \
| * | | | | | ps: add flag to show ABIKenny Root2014-05-141-4/+47
* | | | | | | Merge "Clean up some unnecessary system_properties cruft."Elliott Hughes2014-05-143-6/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Clean up some unnecessary system_properties cruft.Elliott Hughes2014-05-143-6/+0
| | |/ / / / | |/| | | |
* | | | | | Merge changes If5359c26,I5d09be41Sreeram Ramachandran2014-05-141-0/+39
|\ \ \ \ \ \
| * | | | | | Use a function instead of a macro.Sreeram Ramachandran2014-05-141-11/+9
| * | | | | | Mark sockets on accept().Sreeram Ramachandran2014-05-141-0/+41
* | | | | | | Merge "Introduce netd_client, a dynamic library that talks to netd."Sreeram Ramachandran2014-05-145-0/+230
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Introduce netd_client, a dynamic library that talks to netd.Sreeram Ramachandran2014-05-145-0/+230
* | | | | | | Merge "Introduce fwmarkd: a service to set the fwmark of sockets."Sreeram Ramachandran2014-05-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |