1. a0a9e89 resolve merge conflicts of 847d963 to nyc-dev-plus-aosp by Elliott Hughes · 9 years ago
  2. 2f6a1b3 Merge "HACK: libnetutils: Remove parameters from dhcpcd service call" am: 97da9225d9 by Dmitry Shmidt · 9 years ago
  3. ecdd02a Merge "HACK: libnetutils: Remove parameters from dhcpcd service call" by Dmitry Shmidt · 9 years ago
  4. 2f7c1cb Merge "HACK: libnetutils: Remove parameters from dhcpcd service call" by Treehugger Robot · 9 years ago
  5. 2c510c1 Merge "Fix misc-macro-parentheses warnings in liblog." am: 2bd428e1f9 by Chih-hung Hsieh · 9 years ago
  6. 0511c8d Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*" am: 3e3741aa7f by Chih-hung Hsieh · 9 years ago
  7. bb00b66 Merge "Fix misc-macro-parentheses warnings in liblog." am: 2bd428e1f9 by Chih-Hung Hsieh · 9 years ago
  8. f4e22cc Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*" by Chih-Hung Hsieh · 9 years ago
  9. 3ba816e Merge "Fix misc-macro-parentheses warnings in liblog." by Chih-hung Hsieh · 9 years ago
  10. cb7a3c5 Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*" by Chih-hung Hsieh · 9 years ago
  11. 82d6e1b Merge "adb: use asocket\'s close function when closing." am: 684d543922 by Josh Gao · 9 years ago
  12. 3ab050f Merge "adb: use asocket\'s close function when closing." am: 684d543922 by Josh Gao · 9 years ago
  13. 7a65f28 Merge "adb: use asocket's close function when closing." by Treehugger Robot · 9 years ago
  14. 40f8411 Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace." am: dab7d9de03 by Chih-Hung Hsieh · 9 years ago
  15. a4816a4 Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace." by Chih-Hung Hsieh · 9 years ago
  16. 601afdc Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace." by Treehugger Robot · 9 years ago
  17. bd050d0 Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8 am: cea14958d2 am: 71c062f40a by Josh Gao · 9 years ago
  18. 21f601c Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8 am: cea14958d2 by Josh Gao · 9 years ago
  19. b16e023 Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8 by Treehugger Robot · 9 years ago
  20. 21ddae9 HACK: libnetutils: Remove parameters from dhcpcd service call by Dmitry Shmidt · 9 years ago
  21. 5b0aa12 Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace. by Chih-Hung Hsieh · 9 years ago
  22. 2b34d27 Fix misc-macro-parentheses warnings in liblog. by Chih-Hung Hsieh · 9 years ago
  23. dc6ee4e Fix misc-macro-parentheses warnings in libion, libsparse, libmem* by Chih-Hung Hsieh · 9 years ago
  24. ac83130 Remove a dead header (<netutils/dhcp.h>). by Elliott Hughes · 9 years ago
  25. 42eae14 adb: use asocket's close function when closing. by Josh Gao · 9 years ago
  26. 64c427a adb: switch the socket list mutex to a recursive_mutex. by Josh Gao · 9 years ago
  27. 0fc2947 adb: clang-format sockets.cpp. by Josh Gao · 9 years ago
  28. 2664fde adb: add implementations of mutex, recursive_mutex. by Josh Gao · 9 years ago
  29. 0d993ce Merge "liblog: log reader validate headers" am: 0321476fe2 am: 0a7dec432c by Mark Salyzyn · 9 years ago
  30. 912fd34 Merge "liblog: log reader validate headers" am: 0321476fe2 by Mark Salyzyn · 9 years ago
  31. e1d7ed4 Merge "liblog: log reader validate headers" by Mark Salyzyn · 9 years ago
  32. e9d72ba Set parent namespace for linker-namespaces am: ade364b456 by Dimitry Ivanov · 9 years ago
  33. 3f6b43f Merge "Set parent namespace for linker-namespaces" am: ac50d0cc57 am: 3457aba394 by Dimitry Ivanov · 9 years ago
  34. c874ff9 Merge "adb: replace failing exits in adbd with abort()." am: eb62619ff9 by Josh Gao · 9 years ago
  35. 38380ce Merge "adb: add track-jdwp and track-devices commands." am: f8f40a1e2e by Josh Gao · 9 years ago
  36. 6d73e9b Set parent namespace for linker-namespaces by Dimitry Ivanov · 9 years ago
  37. 6d28d47 Merge "Set parent namespace for linker-namespaces" am: ac50d0cc57 by Dimitry Ivanov · 9 years ago
  38. a57a8d3 Merge "adb: replace failing exits in adbd with abort()." am: eb62619ff9 by Josh Gao · 9 years ago
  39. 7c2c57c Merge "adb: add track-jdwp and track-devices commands." am: f8f40a1e2e by Josh Gao · 9 years ago
  40. 70b8d93 Merge "Set parent namespace for linker-namespaces" by Treehugger Robot · 9 years ago
  41. 4d22290 Merge "adb: replace failing exits in adbd with abort()." by Josh Gao · 9 years ago
  42. 18f81d0 Merge "adb: add track-jdwp and track-devices commands." by Josh Gao · 9 years ago
  43. cf950e9 liblog: log reader validate headers by Mark Salyzyn · 9 years ago
  44. 8aeaa55 healthd: Check if battery device exists instead of charger drivers before setting fake properties. am: 9cb3d3ccf4 am: f2ca669e80 by Ruchi Kandoi · 9 years ago
  45. 098940d healthd: Check if battery device exists instead of charger drivers before setting fake properties. am: 9cb3d3ccf4 by Ruchi Kandoi · 9 years ago
  46. cbcb81a healthd: Check if battery device exists instead of charger drivers before setting fake properties. by Ruchi Kandoi · 9 years ago
  47. e179f5b Merge "Fix strstr16." into nyc-dev am: a34a383607 by Michael Wright · 9 years ago
  48. 5f2563c Merge "Fix strstr16." into nyc-dev by Michael Wright · 9 years ago
  49. 2ecbe72 Merge "Don\'t include <machine/cpu-features.h>." am: 9b0eb7cdf4 am: e2c741ce0f by Elliott Hughes · 9 years ago
  50. 3e5e7ea Merge "Pass permitted_path to the linker as is." am: a214a769f9 am: f7d2b8276a by Dimitry Ivanov · 9 years ago
  51. d5d2c56 Pass permitted_path to the linker as is. am: 25df4bff44 by Dimitry Ivanov · 9 years ago
  52. a366c4b Merge "Don\'t include <machine/cpu-features.h>." am: 9b0eb7cdf4 by Elliott Hughes · 9 years ago
  53. ba9deda Merge "Don't include <machine/cpu-features.h>." by Elliott Hughes · 9 years ago
  54. 5429994 Set parent namespace for linker-namespaces by Dimitry Ivanov · 9 years ago
  55. cbd6566 Merge "Pass permitted_path to the linker as is." am: a214a769f9 by Dimitry Ivanov · 9 years ago
  56. f298767 Pass permitted_path to the linker as is. by Dimitry Ivanov · 9 years ago
  57. 9937ed7 Merge "Pass permitted_path to the linker as is." by Treehugger Robot · 9 years ago
  58. 92b4df7 Don't include <machine/cpu-features.h>. by Elliott Hughes · 9 years ago
  59. 86195c5 Pass permitted_path to the linker as is. by Dimitry Ivanov · 9 years ago
  60. 37444f4 Merge "adb/base: allow use of unique_fd inside adb." am: 210fdc2742 by Josh Gao · 9 years ago
  61. 8b32884 Merge "adb/base: allow use of unique_fd inside adb." am: 210fdc2742 by Josh Gao · 9 years ago
  62. 922cf17 Merge "adb/base: allow use of unique_fd inside adb." by Treehugger Robot · 9 years ago
  63. 60d6871 Fix strstr16. by Michael Wright · 9 years ago
  64. 3810b6a Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 by Badhri Jagan Sridharan · 9 years ago
  65. 6edfc8f Merge "init: usb: disable usb function switch until adbd is ready" by Winter Wang · 9 years ago
  66. d15dff7 Merge "init: usb: disable usb function switch until adbd is ready" by Badhri Jagan Sridharan · 9 years ago
  67. 82389a6 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" am: e3ff256228 by Greg Hackmann · 9 years ago
  68. 74df033 Merge "SystemClock: add test" am: 282e8fb037 am: a91a1a990f by Greg Hackmann · 9 years ago
  69. f4c2f0c Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" by Greg Hackmann · 9 years ago
  70. 887ff3f Merge "SystemClock: add test" am: 282e8fb037 by Greg Hackmann · 9 years ago
  71. 27149e3 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" by Treehugger Robot · 9 years ago
  72. e476b62 Merge "SystemClock: add test" by Treehugger Robot · 9 years ago
  73. b66a1ee Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 by Badhri Jagan Sridharan · 9 years ago
  74. 0315083 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 by Jeremy Compostella · 9 years ago
  75. 69194a8 Merge "fs_mgr: update block device reference in verity metadata" by Badhri Jagan Sridharan · 9 years ago
  76. 31d2878 Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9 by Elliott Hughes · 9 years ago
  77. cfdd338 Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9 by Elliott Hughes · 9 years ago
  78. 72bfbaf Merge "Don't expose ashmem constants on the host." by Elliott Hughes · 9 years ago
  79. 10856f9 fs_mgr: update block device reference in verity metadata by Jeremy Compostella · 9 years ago
  80. 891af18 healthd: Check if battery device exists instead of charger drivers before by Ruchi Kandoi · 9 years ago
  81. 22c6fff Merge commit '8b452b876b90dcfff1dab9012b65b5e67c4531a4' into manual_merge_8b452b8 by Michael Wright · 9 years ago
  82. 118640b Merge "Add String16#contains and strstr16 methods." into nyc-dev by TreeHugger Robot · 9 years ago
  83. f878d27 adb: replace failing exits in adbd with abort(). by Josh Gao · 9 years ago
  84. a1c58be adb: add track-jdwp and track-devices commands. by Josh Gao · 9 years ago
  85. aa1251e adb/base: allow use of unique_fd inside adb. by Josh Gao · 9 years ago
  86. 24d0bb2 Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5 by Rob Herring · 9 years ago
  87. 3646f24 Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5 by Rob Herring · 9 years ago
  88. a39c2ce Don't expose ashmem constants on the host. by Elliott Hughes · 9 years ago
  89. e4e6a9c Merge "init: support matching sysfs class paths in ueventd.rc" by Treehugger Robot · 9 years ago
  90. b075bdf init: support matching sysfs class paths in ueventd.rc by Rob Herring · 9 years ago
  91. 22e87ed Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 by Rob Herring · 9 years ago
  92. 3efb19b Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 by Rob Herring · 9 years ago
  93. 7901f4d Merge "init: rework fixup_sys_perms to use perm_path_matches" by Treehugger Robot · 9 years ago
  94. 87c8030 Merge "Move canned_fs_config into libcutils" am: e62cec6e39 am: b44077d8bf by Mohamad Ayyash · 9 years ago
  95. b1d0e2a Merge "Move canned_fs_config into libcutils" am: e62cec6e39 by Mohamad Ayyash · 9 years ago
  96. 3cb4392 Merge "Move canned_fs_config into libcutils" by Treehugger Robot · 9 years ago
  97. 744dd49 Merge "adb: support forwarding TCP port 0." am: cb90562bcf am: 5aaffac37e by David Pursell · 9 years ago
  98. 20c7649 Merge "adb: support forwarding TCP port 0." am: cb90562bcf by David Pursell · 9 years ago
  99. e084c14 Merge "adb: support forwarding TCP port 0." by David Pursell · 9 years ago
  100. cae8c2e Move canned_fs_config into libcutils by Mohamad Ayyash · 9 years ago