1. 1d4ee90 resolve merge conflicts of ab47d14 to master by Elliott Hughes · 9 years ago
  2. 3418294 resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e by Elliott Hughes · 9 years ago
  3. 9d6e550 resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e by Elliott Hughes · 9 years ago
  4. b52bf33 resolve merge conflicts of 54c1219 to stage-aosp-master by Elliott Hughes · 9 years ago
  5. b4a3849 Merge "Move init to libbase logging." by Treehugger Robot · 9 years ago
  6. 495d0be Move init to libbase logging. by Elliott Hughes · 9 years ago
  7. 60f85d9 Merge \\\\"Remove MTD cruft from init.\\\\" am: 90db709a2f am: 80744d867f am: 77b189acd9 by Elliott Hughes · 9 years ago
  8. f1ab8c1 Merge \\\"Remove MTD cruft from init.\\\" am: 90db709a2f am: 80744d867f by Elliott Hughes · 9 years ago
  9. 2bdf4e8 Merge \\"Remove MTD cruft from init.\\" am: 90db709a2f am: 80744d867f by Elliott Hughes · 9 years ago
  10. add3cf6 Merge \"Remove MTD cruft from init.\" am: 90db709a2f by Elliott Hughes · 9 years ago
  11. 2598c05 Merge "Remove MTD cruft from init." by Treehugger Robot · 9 years ago
  12. 93a50a3 Remove MTD cruft from init. by Elliott Hughes · 9 years ago
  13. 281da28 Merge \\\\"Remove more obsolete MTD stuff.\\\\" am: aa9f37185f am: e9a7f52ce5 am: c3f9902cee by Elliott Hughes · 9 years ago
  14. 04c329d Merge \\\"Remove more obsolete MTD stuff.\\\" am: aa9f37185f am: e9a7f52ce5 by Elliott Hughes · 9 years ago
  15. 0e35640 Merge \\"Remove more obsolete MTD stuff.\\" am: aa9f37185f am: e9a7f52ce5 by Elliott Hughes · 9 years ago
  16. 4de9f12 Merge \"Remove more obsolete MTD stuff.\" am: aa9f37185f by Elliott Hughes · 9 years ago
  17. eb37157 Merge "Remove more obsolete MTD stuff." by Treehugger Robot · 9 years ago
  18. 63de69a Remove more obsolete MTD stuff. by Elliott Hughes · 9 years ago
  19. 65bdffa resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 am: 2acf4a81dc by Hung-ying Tyan · 9 years ago
  20. 05a6a4c resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 by Hung-ying Tyan · 9 years ago
  21. 7fb9c47 resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 by Hung-ying Tyan · 9 years ago
  22. 05d2ce3 resolve merge conflicts of 66277db to stage-aosp-master by Hung-ying Tyan · 9 years ago
  23. fffbace Merge "Add -f to insmod" by Hung-ying Tyan · 9 years ago
  24. 3803319 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 Jeffrey Vander Stoep · 9 years ago
  25. 188d7f5 Merge \\\\\\\"add a property for controlling perf_event_paranoid\\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 729722b3ea by Daniel Micay · 9 years ago
  26. 797bd17 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
  27. 899c421 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
  28. 8d5c1a8 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
  29. 8913e9a 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
  30. 79a59fe 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
  31. c0f8d71 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
  32. d68a1db Add -f to insmod by Hung-ying Tyan · 9 years ago
  33. 3b4aed2 Rootdir: Add more asan.options support am: 8ccc1ad0f7 am: e33c9e426b by Andreas Gampe · 9 years ago
  34. 29d517f Rootdir: Add more asan.options support am: 8ccc1ad0f7 by Andreas Gampe · 9 years ago
  35. 3e94a38 Merge \\\\"adb: refactor jdwp_service.cpp.\\\\" am: 71d11ade9d am: a4e35be4a4 am: 36e606236a by Josh Gao · 9 years ago
  36. a70f36c Merge \\\"adb: refactor jdwp_service.cpp.\\\" am: 71d11ade9d am: a4e35be4a4 by Josh Gao · 9 years ago
  37. b5e2d85 Merge \\"adb: refactor jdwp_service.cpp.\\" am: 71d11ade9d am: a4e35be4a4 by Josh Gao · 9 years ago
  38. 4f699cb Merge \"adb: refactor jdwp_service.cpp.\" am: 71d11ade9d by Josh Gao · 9 years ago
  39. e5bed4b Merge \\\\"adb: add test for SIGHUP behavior.\\\\" am: a355dd6110 am: 05f889dd4e am: c0c57c43b2 by Josh Gao · 9 years ago
  40. edc6147 Merge "adb: refactor jdwp_service.cpp." by Treehugger Robot · 9 years ago
  41. c0cb786 Merge \\\"adb: add test for SIGHUP behavior.\\\" am: a355dd6110 am: 05f889dd4e by Josh Gao · 9 years ago
  42. 96c020c Merge \\"adb: add test for SIGHUP behavior.\\" am: a355dd6110 am: 05f889dd4e by Josh Gao · 9 years ago
  43. b73961b Merge \"adb: add test for SIGHUP behavior.\" am: a355dd6110 by Josh Gao · 9 years ago
  44. ebd4fbf Merge "adb: add test for SIGHUP behavior." by Treehugger Robot · 9 years ago
  45. 16b192e adb: add test for SIGHUP behavior. by Josh Gao · 9 years ago
  46. 2435367 Rootdir: Add more asan.options support by Andreas Gampe · 9 years ago
  47. 34d20c8 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 am: 3f8ad892ac by Josh Gao · 9 years ago
  48. adf31e2 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 am: 3f8ad892ac by Josh Gao · 9 years ago
  49. 548c48b Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 by Josh Gao · 9 years ago
  50. 2e48cb9 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 by Josh Gao · 9 years ago
  51. eba4fde Merge changes Ia59c6dbe,I13b17bcd by Treehugger Robot · 9 years ago
  52. cca0013 Merge \\\"add a property for controlling perf_event_paranoid\\\" into mnc-dev am: 050243df76 am: f11efb251d by Daniel Micay · 9 years ago
  53. 933beba Merge \\"add a property for controlling perf_event_paranoid\\" into mnc-dev am: 050243df76 by Jeffrey Vander Stoep · 9 years ago
  54. 246b41e Merge \"add a property for controlling perf_event_paranoid\" into mnc-dev by Daniel Micay · 9 years ago
  55. 5917f39 Merge "add a property for controlling perf_event_paranoid" into mnc-dev by Jeffrey Vander Stoep · 9 years ago
  56. b7f6b52 adb: fix fd leak when shell fails to create a thread. by Josh Gao · 9 years ago
  57. ec72bac adb: don't dup local socket fd. by Josh Gao · 9 years ago
  58. f5bc669 adb: don\\\'t dup local socket fd. am: 42afe2033f -s ours am: 40f40d68ab by Josh Gao · 9 years ago
  59. 32dc26f adb: don\\\'t dup local socket fd. am: 42afe2033f am: 22cbf62602 -s ours by Josh Gao · 9 years ago
  60. d10a6ad adb: don\\'t dup local socket fd. am: 42afe2033f -s ours am: 40f40d68ab by Josh Gao · 9 years ago
  61. 553eccc adb: don\'t dup local socket fd. am: 42afe2033f -s ours by Josh Gao · 9 years ago
  62. 8bd9352 adb: don\\'t dup local socket fd. am: 42afe2033f am: 22cbf62602 -s ours by Josh Gao · 9 years ago
  63. 2ab9b63 adb: don\'t dup local socket fd. am: 42afe2033f by Josh Gao · 9 years ago
  64. 8093020 Merge \\\\"Fix misc-macro-parentheses warnings in system/core.\\\\" am: 495541c5bb am: 65828a0ec9 am: 4a8ab16746 by Chih-Hung Hsieh · 9 years ago
  65. faad44e Merge \\\"Fix misc-macro-parentheses warnings in system/core.\\\" am: 495541c5bb am: 65828a0ec9 by Chih-Hung Hsieh · 9 years ago
  66. 45e8078 adb: don't dup local socket fd. by Josh Gao · 9 years ago
  67. 8f6329d Merge \\"Fix misc-macro-parentheses warnings in system/core.\\" am: 495541c5bb by Chih-Hung Hsieh · 9 years ago
  68. 70eeb88 Merge \"Fix misc-macro-parentheses warnings in system/core.\" am: 495541c5bb by Chih-Hung Hsieh · 9 years ago
  69. 36e0a53 Merge "Fix misc-macro-parentheses warnings in system/core." by Treehugger Robot · 9 years ago
  70. 93627ea Merge \\\\"Lose log to toybox.\\\\" am: cfdd57eed8 am: a247e9ad47 am: e7130d28c7 by Elliott Hughes · 9 years ago
  71. 745c16a Merge \\\"Lose log to toybox.\\\" am: cfdd57eed8 am: a247e9ad47 am: e7130d28c7 by Elliott Hughes · 9 years ago
  72. 31cdff0 Merge \\"Lose log to toybox.\\" am: cfdd57eed8 am: a247e9ad47 by Elliott Hughes · 9 years ago
  73. e36267f Merge \"Lose log to toybox.\" am: cfdd57eed8 by Elliott Hughes · 9 years ago
  74. d0a5f31 Merge "Lose log to toybox." by Treehugger Robot · 9 years ago
  75. ec99ba6 Fix misc-macro-parentheses warnings in system/core. by Chih-Hung Hsieh · 9 years ago
  76. ee8cd20 Merge \\\\"Add support to indicate bitness of public library.\\\\" am: 3fb358478f am: 1b4f54e878 am: 6527fa00f7 by Christopher Ferris · 9 years ago
  77. 4fa84d5 Merge \\\"Add support to indicate bitness of public library.\\\" am: 3fb358478f am: 1b4f54e878 by Christopher Ferris · 9 years ago
  78. 5489273 Merge \\"Add support to indicate bitness of public library.\\" am: 3fb358478f by Christopher Ferris · 9 years ago
  79. 011ff5a Merge \"Add support to indicate bitness of public library.\" am: 3fb358478f by Christopher Ferris · 9 years ago
  80. 0aaeea0 Lose log to toybox. by Elliott Hughes · 9 years ago
  81. aa84434 Merge "Add support to indicate bitness of public library." by Treehugger Robot · 9 years ago
  82. 6074e79 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 Josh Gao · 9 years ago
  83. 5b902d6 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: a2884315f4 by Josh Gao · 9 years ago
  84. eb07cee 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
  85. a5953fb 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
  86. dde14a6 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
  87. 8bc1296 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
  88. d83a2cb 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
  89. 4ebf92e 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 am: 3d93063c14 by Josh Gao · 9 years ago
  90. de0e7f7 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 am: 9d35b1e07e by Josh Gao · 9 years ago
  91. aed1dbd 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
  92. 4453878 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
  93. d7fd611 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
  94. 86de46f 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
  95. 17e4381 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
  96. 852ac57 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
  97. 04474c2 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
  98. 41f0c8b 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
  99. 60ea811 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
  100. 8e734ab 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 by Josh Gao · 9 years ago