1. 4dc379b am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build" by Greg Hackmann · 11 years ago
  2. f76d8a8 am 02c72357: (-s ours) am f8733c63: am 08c08f72: Merge "Move netd_client into netd." by Sreeram Ramachandran · 11 years ago
  3. 5d93823 am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build" by Greg Hackmann · 11 years ago
  4. 153c7aa am 5eedd9d6: Merge "toolbox: fix build" by Greg Hackmann · 11 years ago
  5. 5eedd9d Merge "toolbox: fix build" by Greg Hackmann · 11 years ago
  6. eeed45f toolbox: fix build by Greg Hackmann · 11 years ago
  7. 6cd488e resolved conflicts for merge of faf84529 to master by Mark Salyzyn · 11 years ago
  8. 02c7235 am f8733c63: am 08c08f72: Merge "Move netd_client into netd." by Sreeram Ramachandran · 11 years ago
  9. f8733c6 am 08c08f72: Merge "Move netd_client into netd." by Sreeram Ramachandran · 11 years ago
  10. 08c08f7 Merge "Move netd_client into netd." by Sreeram Ramachandran · 11 years ago
  11. 91dc336 Move netd_client into netd. by Sreeram Ramachandran · 11 years ago
  12. f1b21c5 Move netd_client into netd. by Sreeram Ramachandran · 11 years ago
  13. faf8452 am e2fb764c: am 36ccca15: Merge "toolbox: turn on -Werror" by Mark Salyzyn · 11 years ago
  14. e2fb764 am 36ccca15: Merge "toolbox: turn on -Werror" by Mark Salyzyn · 11 years ago
  15. 36ccca1 Merge "toolbox: turn on -Werror" by Mark Salyzyn · 11 years ago
  16. e14b37e healthd: Add hooks for ENERGY_COUNTER property by Todd Poynor · 11 years ago
  17. b65208d am f7a7e3c3: am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." by Elliott Hughes · 11 years ago
  18. f7a7e3c am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." by Elliott Hughes · 11 years ago
  19. 6dfb039 am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'." by Elliott Hughes · 11 years ago
  20. 4a34343 Merge "Fix win32 undefined reference to `_socket_network_client_timeout'." by Elliott Hughes · 11 years ago
  21. 0bff5bd Fix win32 undefined reference to `_socket_network_client_timeout'. by Elliott Hughes · 11 years ago
  22. aceba82 am cbe7544a: am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9." by Ben Cheng · 11 years ago
  23. fa59e0a am 9bcc5512: am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout." by Elliott Hughes · 11 years ago
  24. cbe7544 am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9." by Ben Cheng · 11 years ago
  25. 7563a60 am 3816305b: Merge "Address additional warnings found by GCC 4.9." by Ben Cheng · 11 years ago
  26. 3816305 Merge "Address additional warnings found by GCC 4.9." by Ben Cheng · 11 years ago
  27. 4323292 Address additional warnings found by GCC 4.9. by Ben Cheng · 11 years ago
  28. 9bcc551 am 796b2015: am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout." by Elliott Hughes · 11 years ago
  29. 796b201 am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout." by Elliott Hughes · 11 years ago
  30. 51e27f9 Merge "Fix win32 implicit declaration of function socket_network_client_timeout." by Elliott Hughes · 11 years ago
  31. b911cf0 Fix win32 implicit declaration of function socket_network_client_timeout. by Elliott Hughes · 11 years ago
  32. abcb999 audio: add definitions for new audio devices by Eric Laurent · 11 years ago
  33. 5756d88 am 87d0f45b: am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures." by Elliott Hughes · 11 years ago
  34. 3edc252 am b42f1413: am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect" by Elliott Hughes · 11 years ago
  35. fbc5ca2 am c6112ca4: am 5b654f15: am 201bf676: Merge "Really fixes the ub branches" by Dan Albert · 11 years ago
  36. 87d0f45 am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures." by Elliott Hughes · 11 years ago
  37. 2dea56e am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures." by Elliott Hughes · 11 years ago
  38. 9e0a624 Merge "Fix Windows socket_network_client.c build failures." by Elliott Hughes · 11 years ago
  39. 3673955 Fix Windows socket_network_client.c build failures. by Elliott Hughes · 11 years ago
  40. b42f141 am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect" by Elliott Hughes · 11 years ago
  41. 0e71e3a am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect" by Elliott Hughes · 11 years ago
  42. 9cae50b Merge "Bound the ADB connect time with a non-blocking connect" by Elliott Hughes · 11 years ago
  43. aecc6a6 Bound the ADB connect time with a non-blocking connect by Ken Lierman · 12 years ago
  44. c6112ca am 5b654f15: am 201bf676: Merge "Really fixes the ub branches" by Dan Albert · 11 years ago
  45. 5b654f1 am 201bf676: Merge "Really fixes the ub branches" by Dan Albert · 11 years ago
  46. 201bf67 Merge "Really fixes the ub branches" by Dan Albert · 11 years ago
  47. ad51136 Really fixes the ub branches by Dan Albert · 11 years ago
  48. 917152b am 3f01965b: am 121f209d: am e1efe23f: Merge "Fix unbundled branches" by Dan Albert · 11 years ago
  49. 3f01965 am 121f209d: am e1efe23f: Merge "Fix unbundled branches" by Dan Albert · 11 years ago
  50. 121f209 am e1efe23f: Merge "Fix unbundled branches" by Dan Albert · 11 years ago
  51. e1efe23 Merge "Fix unbundled branches" by Dan Albert · 11 years ago
  52. a8b8460 Fix unbundled branches by Dan Albert · 11 years ago
  53. 7ce29b5 am e9b36f1a: am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace" by Dan Albert · 11 years ago
  54. e9b36f1 am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace" by Dan Albert · 11 years ago
  55. 888f95e am f03bd953: Merge "Adds libc++ versions of libbacktrace" by Dan Albert · 11 years ago
  56. f03bd95 Merge "Adds libc++ versions of libbacktrace" by Dan Albert · 11 years ago
  57. 40a46dd Adds libc++ versions of libbacktrace by Dan Albert · 11 years ago
  58. bb8e90e am f6aa4863: am 343e49e3: am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP." by Elliott Hughes · 11 years ago
  59. f6aa486 am 343e49e3: am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP." by Elliott Hughes · 11 years ago
  60. 343e49e am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP." by Elliott Hughes · 11 years ago
  61. 0296be9 Merge "Teach debuggerd the name of SIGTRAP." by Elliott Hughes · 11 years ago
  62. a323b50 Teach debuggerd the name of SIGTRAP. by Elliott Hughes · 11 years ago
  63. 20b4073 am 2aa894f3: am 2f1cddfd: am 541859db: Merge "Remove the broken LED flashing code from debuggerd." by Elliott Hughes · 11 years ago
  64. 2aa894f am 2f1cddfd: am 541859db: Merge "Remove the broken LED flashing code from debuggerd." by Elliott Hughes · 11 years ago
  65. 2f1cddf am 541859db: Merge "Remove the broken LED flashing code from debuggerd." by Elliott Hughes · 11 years ago
  66. 541859d Merge "Remove the broken LED flashing code from debuggerd." by Elliott Hughes · 11 years ago
  67. 27ab751 Remove the broken LED flashing code from debuggerd. by Elliott Hughes · 11 years ago
  68. 7393ba0 am 227c3b6c: am a04bad63: am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd." by Elliott Hughes · 11 years ago
  69. 227c3b6 am a04bad63: am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd." by Elliott Hughes · 11 years ago
  70. a04bad6 am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd." by Elliott Hughes · 11 years ago
  71. 9cb0b57 Merge "Output correct gdbserver instructions from debuggerd." by Elliott Hughes · 11 years ago
  72. d9bf2b2 Output correct gdbserver instructions from debuggerd. by Elliott Hughes · 11 years ago
  73. ea28903 am 73d6dc5c: am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build." by Ying Wang · 11 years ago
  74. 73d6dc5 am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build." by Ying Wang · 11 years ago
  75. b0501ab am 770cd7c7: Merge "Fix host 64-bit build." by Ying Wang · 11 years ago
  76. 770cd7c Merge "Fix host 64-bit build." by Ying Wang · 11 years ago
  77. 1bcfe06 am a7952c5c: am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd." by Elliott Hughes · 11 years ago
  78. a7952c5 am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd." by Elliott Hughes · 11 years ago
  79. 5e74210 am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd." by Elliott Hughes · 11 years ago
  80. c4afc19 Merge "Add SIGTRAP support to crasher and debuggerd." by Elliott Hughes · 11 years ago
  81. 7e35ae8 Add SIGTRAP support to crasher and debuggerd. by Elliott Hughes · 11 years ago
  82. a7e8f86 Add channel count functions for audio masks by Andy Hung · 11 years ago
  83. 14b667a am f6309600: am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition" by Colin Cross · 11 years ago
  84. eb25db1 resolved conflicts for merge of f742788a to master by Mark Salyzyn · 11 years ago
  85. f630960 am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition" by Colin Cross · 11 years ago
  86. 3277dc2 am 2d03a498: Merge "correct the setenv option judging condition" by Colin Cross · 11 years ago
  87. 2d03a49 Merge "correct the setenv option judging condition" by Colin Cross · 11 years ago
  88. c3a4676 correct the setenv option judging condition by Gavin.Chang · 12 years ago
  89. f742788 am 24786645: am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events" by Mark Salyzyn · 11 years ago
  90. 2478664 am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events" by Mark Salyzyn · 11 years ago
  91. bc741ac Merge "logd: logcat: debuggerd: auditd logs to events" by Mark Salyzyn · 11 years ago
  92. cf86e2f Fix host 64-bit build. by Ying Wang · 11 years ago
  93. 8f132af healthd: Add ENERGY_COUNTER property placeholder, and 64-bit properties by Todd Poynor · 11 years ago
  94. e1d5247 healthd: fix warnings by Colin Cross · 11 years ago
  95. 2bb25bf am 88a98149: am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size" by Mark Salyzyn · 11 years ago
  96. 88a9814 am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size" by Mark Salyzyn · 11 years ago
  97. 13ee94c am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size" by Mark Salyzyn · 11 years ago
  98. 8b2d46a Merge "init: logd: Allow Developer settings to adjust logd size" by Mark Salyzyn · 11 years ago
  99. 6e6e69e Merge "healthd: Turn on -Werror" by Mark Salyzyn · 11 years ago
  100. bffba2d am dc17deaa: am 891a3919: am b4ad6911: Merge "libadf: silence false positive warning" by Greg Hackmann · 11 years ago