1. dba3e99 resolve merge conflicts of df9d177 to nyc-mr1-dev-plus-aosp by Alex Light · 9 years ago
  2. a5dac1a Fix build breakage from merge conflict resolution. by Elliott Hughes · 9 years ago
  3. df9d177 Merge "Add Fastboot support for flashing secondary images" into nyc-mr1-dev by TreeHugger Robot · 9 years ago
  4. 37ac5e3 resolve merge conflicts of 3fdcf8c to nyc-mr1-dev-plus-aosp by Daniel Rosenberg · 9 years ago
  5. 3fdcf8c Merge changes I939b1e01,I8b723dda,I4acab4b5,Ibc16e93c into nyc-mr1-dev by TreeHugger Robot · 9 years ago
  6. 6e1ef64 resolve merge conflicts of cee6305 to nyc-mr1-dev-plus-aosp by Elliott Hughes · 9 years ago
  7. 6c98509 Add Fastboot support for flashing secondary images by Daniel Rosenberg · 9 years ago
  8. cee6305 Merge \\"Remove unnecessary ARRAY_SIZE macros.\\" am: c37d8ea22a am: 7191a56e96 by Elliott Hughes · 9 years ago
  9. 7191a56 Merge \"Remove unnecessary ARRAY_SIZE macros.\" am: c37d8ea22a by Elliott Hughes · 9 years ago
  10. c37d8ea Merge "Remove unnecessary ARRAY_SIZE macros." by Treehugger Robot · 9 years ago
  11. 8478b1f Merge \\\"Lose start/stop to toybox.\\\" am: 76ef4e8ae2 am: 6beba74a40 by Elliott Hughes · 9 years ago
  12. 6604785 Merge \\"Lose start/stop to toybox.\\" am: 76ef4e8ae2 am: 6beba74a40 by Elliott Hughes · 9 years ago
  13. 6beba74 Merge \"Lose start/stop to toybox.\" am: 76ef4e8ae2 by Elliott Hughes · 9 years ago
  14. 76ef4e8 Merge "Lose start/stop to toybox." by Treehugger Robot · 9 years ago
  15. 190d968 Handle invalid suffix lists by Daniel Rosenberg · 9 years ago
  16. 749ae2d Remove unnecessary ARRAY_SIZE macros. by Elliott Hughes · 9 years ago
  17. 9c9a6c6 Call set_active after flashall and update by Daniel Rosenberg · 9 years ago
  18. 8c32da3 Revert "Make fastboot flash 'B' partitions automatically." by Daniel Rosenberg · 9 years ago
  19. 9d6d096 Revert "Fix issue where non-AB-ota devices will cause flashall to fail." by Daniel Rosenberg · 9 years ago
  20. ab47d14 resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e by Elliott Hughes · 9 years ago
  21. 694b2ec resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e by Elliott Hughes · 9 years ago
  22. 7f5b29f resolve merge conflicts of 54c1219 to stage-aosp-master by Elliott Hughes · 9 years ago
  23. 54c1219 Merge "Move init to libbase logging." by Treehugger Robot · 9 years ago
  24. f86b5a6 Move init to libbase logging. by Elliott Hughes · 9 years ago
  25. db62f10 Merge \\\"Remove MTD cruft from init.\\\" am: 90db709a2f am: 80744d867f by Elliott Hughes · 9 years ago
  26. 77b189a Merge \\"Remove MTD cruft from init.\\" am: 90db709a2f am: 80744d867f by Elliott Hughes · 9 years ago
  27. 80744d8 Merge \"Remove MTD cruft from init.\" am: 90db709a2f by Elliott Hughes · 9 years ago
  28. 90db709 Merge "Remove MTD cruft from init." by Treehugger Robot · 9 years ago
  29. 3195116 Remove MTD cruft from init. by Elliott Hughes · 9 years ago
  30. 50f39dd Lose start/stop to toybox. by Elliott Hughes · 9 years ago
  31. 1ad8466 Merge \\\"Remove more obsolete MTD stuff.\\\" am: aa9f37185f am: e9a7f52ce5 by Elliott Hughes · 9 years ago
  32. c3f9902 Merge \\"Remove more obsolete MTD stuff.\\" am: aa9f37185f am: e9a7f52ce5 by Elliott Hughes · 9 years ago
  33. e9a7f52 Merge \"Remove more obsolete MTD stuff.\" am: aa9f37185f by Elliott Hughes · 9 years ago
  34. aa9f371 Merge "Remove more obsolete MTD stuff." by Treehugger Robot · 9 years ago
  35. 01e5a6c Remove more obsolete MTD stuff. by Elliott Hughes · 9 years ago
  36. 1e94e12 resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 by Hung-ying Tyan · 9 years ago
  37. 2acf4a8 resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 by Hung-ying Tyan · 9 years ago
  38. 23a574a resolve merge conflicts of 66277db to stage-aosp-master by Hung-ying Tyan · 9 years ago
  39. 66277db Merge "Add -f to insmod" by Hung-ying Tyan · 9 years ago
  40. 70fbe30 Merge "Merge \\\\\\"add a property for controlling perf_event_paranoid\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 2ef8922c29" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  41. eec6754 Merge \\\\\\"add a property for controlling perf_event_paranoid\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 by Jeffrey Vander Stoep · 9 years ago
  42. 4fdcc73 Merge \\\\\\"add a property for controlling perf_event_paranoid\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 by Jeffrey Vander Stoep · 9 years ago
  43. 2ef8922 Merge \\\\\"add a property for controlling perf_event_paranoid\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc by Daniel Micay · 9 years ago
  44. 729722b Merge \\\\\"add a property for controlling perf_event_paranoid\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc by Daniel Micay · 9 years ago
  45. 34ae543 Merge \\\\"add a property for controlling perf_event_paranoid\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 by Jeffrey Vander Stoep · 9 years ago
  46. bfa6d75 Add -f to insmod by Hung-ying Tyan · 9 years ago
  47. e33c9e4 Rootdir: Add more asan.options support am: 8ccc1ad0f7 by Andreas Gampe · 9 years ago
  48. e6dd5c7 Merge \\\"adb: refactor jdwp_service.cpp.\\\" am: 71d11ade9d am: a4e35be4a4 by Josh Gao · 9 years ago
  49. 36e6062 Merge \\"adb: refactor jdwp_service.cpp.\\" am: 71d11ade9d am: a4e35be4a4 by Josh Gao · 9 years ago
  50. a4e35be Merge \"adb: refactor jdwp_service.cpp.\" am: 71d11ade9d by Josh Gao · 9 years ago
  51. 71d11ad Merge "adb: refactor jdwp_service.cpp." by Treehugger Robot · 9 years ago
  52. 80c5804 Merge \\\"adb: add test for SIGHUP behavior.\\\" am: a355dd6110 am: 05f889dd4e by Josh Gao · 9 years ago
  53. c0c57c4 Merge \\"adb: add test for SIGHUP behavior.\\" am: a355dd6110 am: 05f889dd4e by Josh Gao · 9 years ago
  54. 05f889d Merge \"adb: add test for SIGHUP behavior.\" am: a355dd6110 by Josh Gao · 9 years ago
  55. a355dd6 Merge "adb: add test for SIGHUP behavior." by Treehugger Robot · 9 years ago
  56. fe50bb7 adb: add test for SIGHUP behavior. by Josh Gao · 9 years ago
  57. 8ccc1ad Rootdir: Add more asan.options support by Andreas Gampe · 9 years ago
  58. 94746b0 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 am: 3f8ad892ac by Josh Gao · 9 years ago
  59. 3f8ad89 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 by Josh Gao · 9 years ago
  60. 79a69f0 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 by Josh Gao · 9 years ago
  61. 0b47d08 Merge changes Ia59c6dbe,I13b17bcd by Treehugger Robot · 9 years ago
  62. 2d48c39 Merge \\\"add a property for controlling perf_event_paranoid\\\" into mnc-dev am: 050243df76 am: f11efb251d by Daniel Micay · 9 years ago
  63. 2a311a9 Merge \\"add a property for controlling perf_event_paranoid\\" into mnc-dev am: 050243df76 by Jeffrey Vander Stoep · 9 years ago
  64. f11efb2 Merge \"add a property for controlling perf_event_paranoid\" into mnc-dev by Daniel Micay · 9 years ago
  65. 050243d Merge "add a property for controlling perf_event_paranoid" into mnc-dev by Jeffrey Vander Stoep · 9 years ago
  66. e31a7a4 adb: fix fd leak when shell fails to create a thread. by Josh Gao · 9 years ago
  67. cd5d737 adb: don't dup local socket fd. by Josh Gao · 9 years ago
  68. b1cb4d9 adb: don\\'t dup local socket fd. am: 42afe2033f -s ours am: 40f40d68ab by Josh Gao · 9 years ago
  69. 40f40d6 adb: don\'t dup local socket fd. am: 42afe2033f -s ours by Josh Gao · 9 years ago
  70. a6b6b98 adb: don\\'t dup local socket fd. am: 42afe2033f am: 22cbf62602 -s ours by Josh Gao · 9 years ago
  71. 22cbf62 adb: don\'t dup local socket fd. am: 42afe2033f by Josh Gao · 9 years ago
  72. 3f646c2 Merge \\\"Fix misc-macro-parentheses warnings in system/core.\\\" am: 495541c5bb am: 65828a0ec9 by Chih-Hung Hsieh · 9 years ago
  73. 42afe20 adb: don't dup local socket fd. by Josh Gao · 9 years ago
  74. 4a8ab16 Merge \\"Fix misc-macro-parentheses warnings in system/core.\\" am: 495541c5bb by Chih-Hung Hsieh · 9 years ago
  75. 65828a0 Merge \"Fix misc-macro-parentheses warnings in system/core.\" am: 495541c5bb by Chih-Hung Hsieh · 9 years ago
  76. 495541c Merge "Fix misc-macro-parentheses warnings in system/core." by Treehugger Robot · 9 years ago
  77. 762dcdb Merge \\\"Lose log to toybox.\\\" am: cfdd57eed8 am: a247e9ad47 am: e7130d28c7 by Elliott Hughes · 9 years ago
  78. e7130d2 Merge \\"Lose log to toybox.\\" am: cfdd57eed8 am: a247e9ad47 by Elliott Hughes · 9 years ago
  79. a247e9a Merge \"Lose log to toybox.\" am: cfdd57eed8 by Elliott Hughes · 9 years ago
  80. cfdd57e Merge "Lose log to toybox." by Treehugger Robot · 9 years ago
  81. cdb2ca5 Fix misc-macro-parentheses warnings in system/core. by Chih-Hung Hsieh · 9 years ago
  82. 38c66fc Merge \\\"Add support to indicate bitness of public library.\\\" am: 3fb358478f am: 1b4f54e878 by Christopher Ferris · 9 years ago
  83. 6527fa0 Merge \\"Add support to indicate bitness of public library.\\" am: 3fb358478f by Christopher Ferris · 9 years ago
  84. 1b4f54e Merge \"Add support to indicate bitness of public library.\" am: 3fb358478f by Christopher Ferris · 9 years ago
  85. cf75c1b Lose log to toybox. by Elliott Hughes · 9 years ago
  86. 3fb3584 Merge "Add support to indicate bitness of public library." by Treehugger Robot · 9 years ago
  87. a1ddb6f Merge "DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd am: 31fc3c3be6" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  88. 9108fcb DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd by Josh Gao · 9 years ago
  89. 72d927d DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd by Josh Gao · 9 years ago
  90. a288431 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours by Josh Gao · 9 years ago
  91. 31fc3c3 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours by Josh Gao · 9 years ago
  92. 2dff649 DO NOT MERGE: adb: use asocket\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 by Josh Gao · 9 years ago
  93. f641076 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours am: 2a9f4e1c50 by Josh Gao · 9 years ago
  94. 46104a0 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 by Josh Gao · 9 years ago
  95. 3d93063 DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours by Josh Gao · 9 years ago
  96. bfbee14 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours am: 2a9f4e1c50 by Josh Gao · 9 years ago
  97. 755ab3e DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 by Josh Gao · 9 years ago
  98. 9d35b1e DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 am: 96dea5690a -s ours by Josh Gao · 9 years ago
  99. 2a9f4e1 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e am: d99c745c31 am: 57b4b422e3 by Josh Gao · 9 years ago
  100. 57f5c95 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours by Josh Gao · 9 years ago