1. 22b6f7a resolve merge conflicts of 0f5d443d0c to nyc-dev-plus-aosp by James Hawkins · 9 years ago
  2. 0f5d443 Merge "system/core: Cleanup direct calls to opendir by containing in a std::unique_ptr." by James Hawkins · 9 years ago
  3. bd04bb0 Merge "system/core: Cleanup direct calls to opendir by containing in a std::unique_ptr." by James Hawkins · 9 years ago
  4. fb516c2 Merge "healthd: separate libbatterymonitor for use in recovery." am: 219806bc7a by Yabin Cui · 9 years ago
  5. a90f776 Merge "healthd: separate libbatterymonitor for use in recovery." am: 219806bc7a by Yabin Cui · 9 years ago
  6. 219806b Merge "healthd: separate libbatterymonitor for use in recovery." by Yabin Cui · 9 years ago
  7. e98e177 healthd: separate libbatterymonitor for use in recovery. by Yabin Cui · 9 years ago
  8. 553e4f6 Merge "imprecise mark and sweep native memory leak detector" am: 6288b28fc7 by Colin Cross · 9 years ago
  9. cf1649d Merge "libutils: add String8 and String16 std_string utility methods" am: fb0670d650 by Samuel Tan · 9 years ago
  10. 4b2e769 Merge "libutils: remove whitespace from String8 files" am: e771e846a8 by Samuel Tan · 9 years ago
  11. 5e7b8ba Merge "imprecise mark and sweep native memory leak detector" am: 6288b28fc7 by Colin Cross · 9 years ago
  12. 6288b28 Merge "imprecise mark and sweep native memory leak detector" by Colin Cross · 9 years ago
  13. 941d48f Merge "libutils: add String8 and String16 std_string utility methods" by Samuel Tan · 9 years ago
  14. fb0670d Merge "libutils: add String8 and String16 std_string utility methods" by Samuel Tan · 9 years ago
  15. 450b9b7 Merge "libutils: remove whitespace from String8 files" am: e771e846a8 by Samuel Tan · 9 years ago
  16. e771e84 Merge "libutils: remove whitespace from String8 files" by Samuel Tan · 9 years ago
  17. 9ac4e00 libutils: add String8 and String16 std_string utility methods by Samuel Tan · 9 years ago
  18. 95fd527 libutils: remove whitespace from String8 files by Samuel Tan · 9 years ago
  19. cc5b2c7 Merge "adb: fix clang-format for access modifier dedent." am: d5126ddf71 by Josh Gao · 9 years ago
  20. 728da79 Merge "adb: fix clang-format for access modifier dedent." am: d5126ddf71 by Josh Gao · 9 years ago
  21. d5126dd Merge "adb: fix clang-format for access modifier dedent." by Josh Gao · 9 years ago
  22. 588a2ca system/core: Cleanup direct calls to opendir by containing in a std::unique_ptr. by James Hawkins · 9 years ago
  23. 5da522e adb: fix clang-format for access modifier dedent. by Josh Gao · 9 years ago
  24. cb77e15 Limit libart.so visibility to apps targeting <= M am: dab56737ca by Dimitry Ivanov · 9 years ago
  25. dab5673 Limit libart.so visibility to apps targeting <= M by Dimitry Ivanov · 9 years ago
  26. c80b038 Merge "Remove logcat\'s false dependency on a libutils header file." am: d3289ac581 by Elliott Hughes · 9 years ago
  27. 71bb9c6 Merge "Remove logcat\'s false dependency on a libutils header file." by Elliott Hughes · 9 years ago
  28. b818c74 Merge changes Ib17f0a55,Ia5bbae6b,I339d42fc into nyc-dev am: 7bbb4a0c49 by David Pursell · 9 years ago
  29. d3289ac Merge "Remove logcat's false dependency on a libutils header file." by Elliott Hughes · 9 years ago
  30. 7bbb4a0 Merge changes Ib17f0a55,Ia5bbae6b,I339d42fc into nyc-dev by David Pursell · 9 years ago
  31. fecc5d6 Merge "healthd: Add "No UI" operation for charger mode" am: fdd26c961d by Todd Poynor · 9 years ago
  32. 6355bc8 Merge "healthd: Add "No UI" operation for charger mode" am: fdd26c961d by Todd Poynor · 9 years ago
  33. fdd26c9 Merge "healthd: Add "No UI" operation for charger mode" by Todd Poynor · 9 years ago
  34. 7c5a3e1 healthd: Add "No UI" operation for charger mode by Todd Poynor · 9 years ago
  35. 2196d7b Merge "fake_log_device: long lived allocations" am: 3fd5649424 am: c10b039d28 by Mark Salyzyn · 9 years ago
  36. 022d8f5 fastboot: fix TCP protocol version check. by David Pursell · 9 years ago
  37. 5a0ec81 fastboot: add UDP protocol. by David Pursell · 9 years ago
  38. c10b039 Merge "fake_log_device: long lived allocations" am: 3fd5649424 by Mark Salyzyn · 9 years ago
  39. 8bcce68 fastboot: add Socket timeout detection. by David Pursell · 9 years ago
  40. 3fd5649 Merge "fake_log_device: long lived allocations" by Mark Salyzyn · 9 years ago
  41. 04f8fe7 Merge "Remove two bogus libutils dependencies." am: fd9619004b am: b3639658ed by Elliott Hughes · 9 years ago
  42. a3894b5 Merge "Remove libbase\'s libutils dependency." am: b3a77b1198 am: 0a475f8dd2 by Elliott Hughes · 9 years ago
  43. 0753f1f Merge commit \'4352ee87fd74b931d4b58192fb8974e91aa899d0\' into HEAD by Bill Yi · 9 years ago
  44. b363965 Merge "Remove two bogus libutils dependencies." am: fd9619004b by Elliott Hughes · 9 years ago
  45. 0a475f8 Merge "Remove libbase\'s libutils dependency." am: b3a77b1198 by Elliott Hughes · 9 years ago
  46. 0085a13 fake_log_device: long lived allocations by Mark Salyzyn · 9 years ago
  47. fd96190 Merge "Remove two bogus libutils dependencies." by Elliott Hughes · 9 years ago
  48. b3a77b1 Merge "Remove libbase's libutils dependency." by Elliott Hughes · 9 years ago
  49. b9e53b4 Remove logcat's false dependency on a libutils header file. by Elliott Hughes · 9 years ago
  50. ce92718 Remove two bogus libutils dependencies. by Elliott Hughes · 9 years ago
  51. 38e2b63 Remove libbase's libutils dependency. by Elliott Hughes · 9 years ago
  52. 4409f14 Merge commit '4352ee87fd74b931d4b58192fb8974e91aa899d0' into HEAD by Bill Yi · 9 years ago
  53. 7e84cbd Merge "healthd: init members of BatteryMonitor." am: 2773d4f96a by Yabin Cui · 9 years ago
  54. 2773d4f Merge "healthd: init members of BatteryMonitor." by Yabin Cui · 9 years ago
  55. 7b3b490 Merge "fastboot: fix TCP protocol version check." am: bcaeb78f63 by David Pursell · 9 years ago
  56. bcaeb78 Merge "fastboot: fix TCP protocol version check." by David Pursell · 9 years ago
  57. aad72a5 fastboot: fix TCP protocol version check. by David Pursell · 9 years ago
  58. 78cf937 Merge "bootstat: Record metrics for factory_reset and time_since_factory_reset." by James Hawkins · 9 years ago
  59. 8a97f88 Merge "bootstat: Record metrics for factory_reset and time_since_factory_reset." by James Hawkins · 9 years ago
  60. cbe5e79 Add CASIO to approved vendor IDs am: 6c48349dee am: 1dec743e01 -s ours by Mohamad Ayyash · 9 years ago
  61. 14ae3f2 Add CASIO to approved vendor IDs am: 6c48349dee am: 1dec743e01 -s ours by Mohamad Ayyash · 9 years ago
  62. 1dec743 Add CASIO to approved vendor IDs am: 6c48349dee by Mohamad Ayyash · 9 years ago
  63. 6c48349 Add CASIO to approved vendor IDs by Mohamad Ayyash · 9 years ago
  64. 47f619b Merge "Tolerate RTM_DELADDR messages from deleted interfaces." into nyc-dev by Lorenzo Colitti · 9 years ago
  65. 8bb06b6 Merge "Tolerate RTM_DELADDR messages from deleted interfaces." into nyc-dev by Lorenzo Colitti · 9 years ago
  66. 985e34b Merge "bootstat: Add a few more bootreasons and rebase the index against index 1." into nyc-dev by James Hawkins · 9 years ago
  67. db04a49 healthd: init members of BatteryMonitor. by Yabin Cui · 9 years ago
  68. 9518b9d Merge "libutils: remove whitespaces in String16.cpp and String16.h" by Samuel Tan · 9 years ago
  69. 8c09555 Merge "libutils: remove whitespaces in String16.cpp and String16.h" by Samuel Tan · 9 years ago
  70. 500d715 bootstat: Record metrics for factory_reset and time_since_factory_reset. by James Hawkins · 9 years ago
  71. eef3703 Merge "Add .clang-format symlink to Brillo\'s clang-format." am: 753676a154 by Alex Deymo · 9 years ago
  72. def8419 Merge "bootstat: Add a few more bootreasons and rebase the index against index 1." into nyc-dev by James Hawkins · 9 years ago
  73. 753676a Merge "Add .clang-format symlink to Brillo's clang-format." by Alex Deymo · 9 years ago
  74. f9d16ef libutils: remove whitespaces in String16.cpp and String16.h by Samuel Tan · 9 years ago
  75. 5e087e4 Add .clang-format symlink to Brillo's clang-format. by Alex Deymo · 9 years ago
  76. 604b89f Merge "logd: enforce policy integrity" am: d1ac932330 by Sami Tolvanen · 9 years ago
  77. 5ce57a6 Merge "Move libnetutils headers into libnetutils." am: d61ad3c44e by Elliott Hughes · 9 years ago
  78. d1ac932 Merge "logd: enforce policy integrity" by Sami Tolvanen · 9 years ago
  79. 0938982 Merge "Remove unnecessary #include from <memtrack/memtrack.h>." am: 0a3a46afea by Elliott Hughes · 9 years ago
  80. d61ad3c Merge "Move libnetutils headers into libnetutils." by Elliott Hughes · 9 years ago
  81. 0a3a46a Merge "Remove unnecessary #include from <memtrack/memtrack.h>." by Elliott Hughes · 9 years ago
  82. d122ee6 logd: enforce policy integrity by Sami Tolvanen · 9 years ago
  83. c50a99c Merge "liblog: document fakeLogClose never to be called" am: 8cd629aedd by Mark Salyzyn · 9 years ago
  84. 3e08b82 Merge "Move libdiskconfig headers into libdiskconfig." am: 737325fb7c by Elliott Hughes · 9 years ago
  85. dc52d09 Merge "Don\'t go busy loop when waiting child process." am: ae2b746c82 by Elliott Hughes · 9 years ago
  86. 008ed76 Merge "fs_mgr: BLKGETSIZE causes memory corruption" am: 9c9818374e by Elliott Hughes · 9 years ago
  87. ffd662d Merge "Move libmemtrack headers into libmemtrack." am: 1c3d784030 by Elliott Hughes · 9 years ago
  88. 8cd629a Merge "liblog: document fakeLogClose never to be called" by Mark Salyzyn · 9 years ago
  89. bc81b17 liblog: document fakeLogClose never to be called by Mark Salyzyn · 9 years ago
  90. 737325f Merge "Move libdiskconfig headers into libdiskconfig." by Elliott Hughes · 9 years ago
  91. e81f4d6 Remove unnecessary #include from <memtrack/memtrack.h>. by Elliott Hughes · 9 years ago
  92. ae2b746 Merge "Don't go busy loop when waiting child process." by Elliott Hughes · 9 years ago
  93. 9c98183 Merge "fs_mgr: BLKGETSIZE causes memory corruption" by Elliott Hughes · 9 years ago
  94. bc31090 Don't go busy loop when waiting child process. by Tao Wu · 9 years ago
  95. d93adf5 fs_mgr: BLKGETSIZE causes memory corruption by Keith Mok · 9 years ago
  96. 1c3d784 Merge "Move libmemtrack headers into libmemtrack." by Elliott Hughes · 9 years ago
  97. ef6454d Tolerate RTM_DELADDR messages from deleted interfaces. by Lorenzo Colitti · 9 years ago
  98. 68ed65a Re-derive permissions after package changes. am: a44febd19b am: 36a6835aa5 am: 77a3c8fccd by Jeff Sharkey · 9 years ago
  99. 7916cc9 Re-derive permissions after package changes. am: a44febd19b am: 36a6835aa5 by Jeff Sharkey · 9 years ago
  100. 77a3c8f Re-derive permissions after package changes. am: a44febd19b am: 36a6835aa5 by Jeff Sharkey · 9 years ago