1. c4bab46 resolve merge conflicts of a617e33 to stage-aosp-master by Dmitry Shmidt · 9 years ago
  2. ae8be61 Merge "batterymonitor: simplify readFromFile and use std::string buffers" by Treehugger Robot · 9 years ago
  3. 38fd8af batterymonitor: simplify readFromFile and use std::string buffers by Michael Scott · 9 years ago
  4. 203bbe0 Merge \"Fix race condition updating local map data.\" am: 863d8e11b9 by Christopher Ferris · 9 years ago
  5. 48cd5bf Merge "Fix race condition updating local map data." by Christopher Ferris · 9 years ago
  6. c1813b3 Fix race condition updating local map data. by Christopher Ferris · 9 years ago
  7. 7bb9fff Merge \"init: report createProcessGroup failure.\" am: 2d690a920f by Elliott Hughes · 9 years ago
  8. 6255286 Merge "init: report createProcessGroup failure." by Treehugger Robot · 9 years ago
  9. d4ffdb7 Merge \"adb: make adb root not wait-for-device.\" am: 81e59ca5a7 by Josh Gao · 9 years ago
  10. 50afb7e Merge "adb: make adb root not wait-for-device." by Treehugger Robot · 9 years ago
  11. cf5c98e adb: make adb root not wait-for-device. by Josh Gao · 9 years ago
  12. ee6fb6e Merge \"Set zygote process priority to -20 to speed up VM startup time.\" by Vitalii Tomkiv · 9 years ago
  13. 37c3068 Merge "Set zygote process priority to -20 to speed up VM startup time." by Vitalii Tomkiv · 9 years ago
  14. 86c31f9 Merge \"Better diagnostics from \"adb sideload\".\" am: edd401e24e by Elliott Hughes · 9 years ago
  15. 1bedf84 Merge "Better diagnostics from "adb sideload"." by Treehugger Robot · 9 years ago
  16. 7fbe9a8 Merge \"Minor adb style fixes.\" am: 35151f49ca by Elliott Hughes · 9 years ago
  17. 4907f5e Merge "Minor adb style fixes." by Treehugger Robot · 9 years ago
  18. e32660e Better diagnostics from "adb sideload". by Elliott Hughes · 9 years ago
  19. 7bd90ed init: report createProcessGroup failure. by Elliott Hughes · 9 years ago
  20. 4b90ea9 Minor adb style fixes. by Elliott Hughes · 9 years ago
  21. 9f2c0ff Merge \\"fs_mgr: Track the bootloader_message struct change.\\" am: 4d34653720 by Tao Bao · 9 years ago
  22. f216a7b Merge \"fs_mgr: Track the bootloader_message struct change.\" am: 4d34653720 by Tao Bao · 9 years ago
  23. ec73020 Merge "fs_mgr: Track the bootloader_message struct change." by Tao Bao · 9 years ago
  24. 8a5046e Merge \\"Lose top to toybox.\\" am: 0f5b6c160c am: 0e0ce6ca6c by Elliott Hughes · 9 years ago
  25. c1dd633 Merge \"Lose top to toybox.\" am: 0f5b6c160c by Elliott Hughes · 9 years ago
  26. bd3b377 Merge "Lose top to toybox." by Elliott Hughes · 9 years ago
  27. 7c67417 Lose top to toybox. by Elliott Hughes · 9 years ago
  28. dd54f49 Merge \\"Fix the sense of a test in \\"adb sideload\\".\\" am: 62cc17de8c by Elliott Hughes · 9 years ago
  29. 0735600 Merge \"Fix the sense of a test in \"adb sideload\".\" am: 62cc17de8c by Elliott Hughes · 9 years ago
  30. 565ee7b Merge "Fix the sense of a test in "adb sideload"." by Elliott Hughes · 9 years ago
  31. e226b61 Fix the sense of a test in "adb sideload". by Elliott Hughes · 9 years ago
  32. 8dd04f0 Merge \\"fs_mgr: validate corrected signatures\\" am: 4824e794b2 am: 270531fb49 by Sami Tolvanen · 9 years ago
  33. 1e8e244 Merge \"fs_mgr: validate corrected signatures\" am: 4824e794b2 by Sami Tolvanen · 9 years ago
  34. c320e5f Merge "fs_mgr: validate corrected signatures" by Sami Tolvanen · 9 years ago
  35. e59f8c4 Merge \\"logcatd: add stop and clear actions\\" am: 2546a7f8fd am: d62a49b202 by Mark Salyzyn · 9 years ago
  36. 7abb056 Merge \\"logcatd: Do not su for setprop\\" am: 0dbe899d98 am: 6933321c6a by Mark Salyzyn · 9 years ago
  37. d24391e Merge \\"logcat: clear when specifying file output\\" am: c91fbfee48 by Mark Salyzyn · 9 years ago
  38. 4491efe Merge \"logcatd: add stop and clear actions\" am: 2546a7f8fd by Mark Salyzyn · 9 years ago
  39. 944ca8c Merge \"logcatd: Do not su for setprop\" am: 0dbe899d98 by Mark Salyzyn · 9 years ago
  40. dd424f8 Merge \"logcat: clear when specifying file output\" am: c91fbfee48 by Mark Salyzyn · 9 years ago
  41. eac81ca Merge "logcatd: add stop and clear actions" by Mark Salyzyn · 9 years ago
  42. c7c68c5 logcatd: add stop and clear actions by Mark Salyzyn · 9 years ago
  43. 563f961 Merge "logcatd: Do not su for setprop" by Mark Salyzyn · 9 years ago
  44. f201c50 logcatd: Do not su for setprop by Mark Salyzyn · 9 years ago
  45. 398edb3 Merge "logcat: clear when specifying file output" by Treehugger Robot · 9 years ago
  46. e233634 logcat: clear when specifying file output by Mark Salyzyn · 9 years ago
  47. d5602d5 fs_mgr: Track the bootloader_message struct change. by Tao Bao · 9 years ago
  48. 2a0b01f Merge \\"ueventd: only relabel devices if there\\'s a delta\\" am: 95428817d6 by William Roberts · 9 years ago
  49. 0e883f8 Merge \"ueventd: only relabel devices if there\'s a delta\" am: 95428817d6 by William Roberts · 9 years ago
  50. ce9a0d6 Merge "ueventd: only relabel devices if there's a delta" by Treehugger Robot · 9 years ago
  51. 50598b3 Merge \"Redirect bugreport stderr to host\'s stderr.\" into nyc-dev by Felipe Leme · 9 years ago
  52. c1fd67d Merge "Redirect bugreport stderr to host's stderr." into nyc-dev by TreeHugger Robot · 9 years ago
  53. 2756993 Merge \\"Revert \\"logcat: expand -n, -r and -b\\"\\" am: 8c60f2dcfe by Mark Salyzyn · 9 years ago
  54. 6349f88 Merge \"Revert \"logcat: expand -n, -r and -b\"\" am: 8c60f2dcfe by Mark Salyzyn · 9 years ago
  55. 78f9778 Merge \\"init: expand arguments of services when they start\\" am: 86cd314af3 by Tom Cherry · 9 years ago
  56. 040962e Merge "Revert "logcat: expand -n, -r and -b"" by Mark Salyzyn · 9 years ago
  57. 5249866 Merge \"init: expand arguments of services when they start\" am: 86cd314af3 by Tom Cherry · 9 years ago
  58. cafe76d Merge "init: expand arguments of services when they start" by Tom Cherry · 9 years ago
  59. 7f67e1c Merge \\"Add process priority to service definition.\\" am: 14b00baaae by Vitalii Tomkiv · 9 years ago
  60. ef92e2d Merge \"Add process priority to service definition.\" am: 14b00baaae by Vitalii Tomkiv · 9 years ago
  61. 86613ac Merge "Add process priority to service definition." by Vitalii Tomkiv · 9 years ago
  62. 24e8ffa Add process priority to service definition. by Vitalii Tomkiv · 9 years ago
  63. 5d0595f Redirect bugreport stderr to host's stderr. by Felipe Leme · 9 years ago
  64. fd815b2 Set zygote process priority to -20 to speed up VM startup time. by Vitalii Tomkiv · 9 years ago
  65. b6211da Merge \\"Set file capabilities on adb sync/push.\\" am: a500cf9cdf by Elliott Hughes · 9 years ago
  66. 06ee2c1 Merge \"Set file capabilities on adb sync/push.\" am: a500cf9cdf by Elliott Hughes · 9 years ago
  67. 93b5308 Merge "Set file capabilities on adb sync/push." by Treehugger Robot · 9 years ago
  68. 21d7119 Allow multiple (sequential) adb users on Linux. am: 75f42d7ea7 by Elliott Hughes · 9 years ago
  69. 4d98e40 fs_mgr: validate corrected signatures by Sami Tolvanen · 9 years ago
  70. 2140e03 Set file capabilities on adb sync/push. by Elliott Hughes · 9 years ago
  71. 28aec60 Allow multiple (sequential) adb users on Linux. by Elliott Hughes · 9 years ago
  72. add8abd Revert "logcat: expand -n, -r and -b" by Mark Salyzyn · 9 years ago
  73. bff0756 Merge \\"Allow multiple (sequential) adb users on Linux.\\" am: 6bf8d26c82 by Elliott Hughes · 9 years ago
  74. 0c40d7b Merge \"Allow multiple (sequential) adb users on Linux.\" am: 6bf8d26c82 by Elliott Hughes · 9 years ago
  75. 2ab237b Merge "Allow multiple (sequential) adb users on Linux." by Elliott Hughes · 9 years ago
  76. b35fcbd Allow multiple (sequential) adb users on Linux. by Elliott Hughes · 9 years ago
  77. f8da3a7 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" am: 35d84096e9 by Mattias Nissler · 9 years ago
  78. b3f5155 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" by Mattias Nissler · 9 years ago
  79. 4df2923 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" by Mattias Nissler · 9 years ago
  80. b68683f Merge "libnetutils: Add synchronization per socket full operation" am: 04045fd4d1 by Dmitry Shmidt · 9 years ago
  81. b79e607 Manually fix automerger error on 4ab7548 am: a6f1c46fa0 by Mark Salyzyn · 9 years ago
  82. d303132 Merge "libnetutils: Add synchronization per socket full operation" by Dmitry Shmidt · 9 years ago
  83. e1920b1 Manually fix automerger error on 4ab7548 by The Android Automerger · 9 years ago
  84. 0c01dcf Merge "libnetutils: Add synchronization per socket full operation" by Treehugger Robot · 9 years ago
  85. a55d010 Merge "init: Add support for ${x.y:-default} expansion" by Treehugger Robot · 9 years ago
  86. 16497ef init: expand arguments of services when they start by Tom Cherry · 9 years ago
  87. 19192e7 init: Add support for ${x.y:-default} expansion by Mark Salyzyn · 9 years ago
  88. 557c09e libnetutils: Add synchronization per socket full operation by Dmitry Shmidt · 10 years ago
  89. b1db0c1 Merge "fs_mgr: fix encryptable=footer support" am: b67fed557f am: 7f06a23414 by Chuanxiao Dong · 9 years ago
  90. aee23aa Merge "fs_mgr: fix encryptable=footer support" am: b67fed557f by Chuanxiao Dong · 9 years ago
  91. 6e6e2cd Merge "fs_mgr: fix encryptable=footer support" by Treehugger Robot · 9 years ago
  92. 8961270 Merge "Use alignas for alignment." am: bb1e7977fb am: 689b998ab2 by Elliott Hughes · 9 years ago
  93. 05191be Merge "Use alignas for alignment." am: bb1e7977fb by Elliott Hughes · 9 years ago
  94. f4a29c1 Merge "Use alignas for alignment." by Elliott Hughes · 9 years ago
  95. 19dc1e5 fs_mgr: Remove incorrect free() on error paths in load_key() by Mattias Nissler · 9 years ago
  96. a1919ec resolve merge conflicts of eacbb82 to nyc-dev-plus-aosp by Sami Tolvanen · 9 years ago
  97. 7016279 Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp by Elliott Hughes · 9 years ago
  98. 2848f76 resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp by Elliott Hughes · 9 years ago
  99. 69f75e3 Merge "use process groups for processes started by init" am: ebe636e5ce by Collin Mulliner · 9 years ago
  100. 598ba8a Merge "use process groups for processes started by init" by Elliott Hughes · 9 years ago