1. 4de0622 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours am: cfb8b6aea6 am: c1167dd4c9 by Josh Gao · 9 years ago
  2. 4c72350 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b -s ours am: 8b2a975e12 am: 557d55afd5 by Josh Gao · 9 years ago
  3. c70e50e Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours am: cfb8b6aea6 by Josh Gao · 9 years ago
  4. b9110d5 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b -s ours am: 8b2a975e12 by Josh Gao · 9 years ago
  5. dfe82f6 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours am: cfb8b6aea6 by Josh Gao · 9 years ago
  6. 1a0aa73 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b -s ours am: 8b2a975e12 by Josh Gao · 9 years ago
  7. 0c12f5e Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours by Josh Gao · 9 years ago
  8. 8df10e7 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours by Josh Gao · 9 years ago
  9. 1761da1 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b -s ours by Josh Gao · 9 years ago
  10. e46ee0f DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b -s ours by Josh Gao · 9 years ago
  11. ada4c0c Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 by Josh Gao · 9 years ago
  12. a7eaed4 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 by Josh Gao · 9 years ago
  13. 1cac6ee Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 by Josh Gao · 9 years ago
  14. 139a8d1 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f by Josh Gao · 9 years ago
  15. a143c51 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c by Josh Gao · 9 years ago
  16. e0f7284 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e by Josh Gao · 9 years ago
  17. 6c2511f Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev by Josh Gao · 9 years ago
  18. c79bc3b DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e by Josh Gao · 9 years ago
  19. ad77019 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev by TreeHugger Robot · 9 years ago
  20. ffd89e6 DO NOT MERGE: adb: reenable (and fix) Windows build. by Josh Gao · 9 years ago
  21. 154e81a Merge "Define TARGET_IS_64_BIT when building libdebuggerd_client for android64." am: 07f14c9cdd am: 40efc4c664 by Josh Gao · 9 years ago
  22. 70cda70 Merge "Remove redundant action triggers on persist.sys.usb.config" into nyc-mr1-dev am: 031afc0dba by Badhri Jagan Sridharan · 9 years ago
  23. 2ccf7bf Remove redundant action triggers on persist.sys.usb.config am: 05e04a134e by Badhri Jagan Sridharan · 9 years ago
  24. 5dc6dfd Merge "Define TARGET_IS_64_BIT when building libdebuggerd_client for android64." am: 07f14c9cdd by Josh Gao · 9 years ago
  25. 87e8af8 Merge "Define TARGET_IS_64_BIT when building libdebuggerd_client for android64." by Josh Gao · 9 years ago
  26. 0296538 Merge "Remove redundant action triggers on persist.sys.usb.config" into nyc-mr1-dev by Badhri Jagan Sridharan · 9 years ago
  27. 22ed02f Remove redundant action triggers on persist.sys.usb.config am: 05e04a134e by Badhri Jagan Sridharan · 9 years ago
  28. ca6f024 Merge "Define TARGET_IS_64_BIT when building libdebuggerd_client for android64." by Josh Gao · 9 years ago
  29. 53e8679 Merge "Remove redundant action triggers on persist.sys.usb.config" into nyc-mr1-dev by Badhri Jagan Sridharan · 9 years ago
  30. 7631cd6 Merge "Improve RefBase documentation, especially for clients." am: 0f39fe22ae am: df6c464e9a by Hans Boehm · 9 years ago
  31. 3bc0ac7 Merge "Improve RefBase documentation, especially for clients." am: 0f39fe22ae by Hans Boehm · 9 years ago
  32. c2c378c Merge "Improve RefBase documentation, especially for clients." am: 0f39fe22ae by Hans Boehm · 9 years ago
  33. 60906f7 Merge "Improve RefBase documentation, especially for clients." by Hans Boehm · 9 years ago
  34. 4feea60 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 am: 647ec18a9d -s ours am: 364188b9d8 am: faa7e41a7f by Josh Gao · 9 years ago
  35. b4af7a9 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 am: 647ec18a9d -s ours am: 364188b9d8 by Josh Gao · 9 years ago
  36. d4a730f debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 am: 647ec18a9d -s ours am: 364188b9d8 by Josh Gao · 9 years ago
  37. 3dfb303 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 am: 647ec18a9d -s ours by Josh Gao · 9 years ago
  38. 7ccba0a debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 am: 647ec18a9d -s ours by Josh Gao · 9 years ago
  39. 076f940 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 by Josh Gao · 9 years ago
  40. 4d79c4e debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 by Josh Gao · 9 years ago
  41. b257e26 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f by Josh Gao · 9 years ago
  42. d15f739 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f by Josh Gao · 9 years ago
  43. eb1c7ed debuggerd: fix missed use of ptrace(PTRACE_ATTACH). by Josh Gao · 9 years ago
  44. 09588d7 Improve RefBase documentation, especially for clients. by Hans Boehm · 9 years ago
  45. 4cbf96c Define TARGET_IS_64_BIT when building libdebuggerd_client for android64. by Robert Sesek · 9 years ago
  46. 6083912 logd: klogd crash am: fbbf99256a am: 97174be64c by Mark Salyzyn · 9 years ago
  47. cbf0730 logd: klogd crash am: fbbf99256a by Mark Salyzyn · 9 years ago
  48. e0576ae logd: klogd crash by Mark Salyzyn · 9 years ago
  49. 20145b5 Merge "logd: klogd crash" am: e23e0914ff am: 5118d8f633 am: 73ded18d31 by Mark Salyzyn · 9 years ago
  50. 7791bea Merge "logd: klogd crash" am: e23e0914ff am: 5118d8f633 by Mark Salyzyn · 9 years ago
  51. 4ac78d0 Merge "logd: klogd crash" am: e23e0914ff by Mark Salyzyn · 9 years ago
  52. 46573f4 Merge "logd: klogd crash" by Mark Salyzyn · 9 years ago
  53. 7cc356e Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." am: 2f21b7cecd am: f2f4e784a4 by Elliott Hughes · 9 years ago
  54. 6c58894 Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." am: 2f21b7cecd by Elliott Hughes · 9 years ago
  55. 726fd83 Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." by Elliott Hughes · 9 years ago
  56. f14e448 Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." by Treehugger Robot · 9 years ago
  57. e36b5a3 resolve merge conflicts of 5f6dbd9 to nyc-mr1-dev-plus-aosp by Mark Salyzyn · 9 years ago
  58. d910aca Merge changes I628d590a,I1c13b94e,Iecf61bb2,I5b1c929d,I895749ca, ... am: 1d3e13dcfc by Mark Salyzyn · 9 years ago
  59. c3c24c2 Merge changes I628d590a,I1c13b94e,Iecf61bb2,I5b1c929d,I895749ca, ... by Mark Salyzyn · 9 years ago
  60. 13db3e3 std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom. by Elliott Hughes · 9 years ago
  61. c80b414 Merge changes I628d590a,I1c13b94e,Iecf61bb2,I5b1c929d,I895749ca, ... by Treehugger Robot · 9 years ago
  62. 134cc42 Merge "libcrypto_utils: convert to Soong." am: c1a9a21ffe am: 87ef590bc1 by Josh Gao · 9 years ago
  63. 72418d0 Merge "libcrypto_utils: convert to Soong." am: c1a9a21ffe am: 87ef590bc1 by Josh Gao · 9 years ago
  64. 824a38e Merge "logcatd: logpersist.start more descriptive warning" am: dad158f3a1 am: 2c1322f751 by Mark Salyzyn · 9 years ago
  65. 2d28927 Merge "libcrypto_utils: convert to Soong." am: c1a9a21ffe by Josh Gao · 9 years ago
  66. 99d2ec9 Merge "logcatd: logpersist.start more descriptive warning" am: dad158f3a1 by Mark Salyzyn · 9 years ago
  67. a9dcca4 Merge "logcatd: logpersist.start more descriptive warning" am: dad158f3a1 by Mark Salyzyn · 9 years ago
  68. 68b243e Merge "libcrypto_utils: convert to Soong." by Josh Gao · 9 years ago
  69. b18d3f0 Merge "logcatd: logpersist.start more descriptive warning" by Treehugger Robot · 9 years ago
  70. 00d73aa Merge "SharedBuffer: Fix bug in return value of release()" am: c064db48f1 am: f068856284 by Greg Kaiser · 9 years ago
  71. f40aee1 Merge "SharedBuffer: Fix bug in return value of release()" am: c064db48f1 by Greg Kaiser · 9 years ago
  72. ef0ed8c Merge "SharedBuffer: Fix bug in return value of release()" am: c064db48f1 by Greg Kaiser · 9 years ago
  73. 0c0006e Merge "SharedBuffer: Fix bug in return value of release()" by Greg Kaiser · 9 years ago
  74. 4385fb8 logcat: -d, -t or -L, along with -f, do not background by Mark Salyzyn · 9 years ago
  75. 5f08a60 logcat: lastLogTime only two most recent files by Mark Salyzyn · 9 years ago
  76. 3cb2b74 logcatd: Add --id=${ro.build.id} by Mark Salyzyn · 9 years ago
  77. c7af9ba logcatd: fix up logpersist.cat to filter out signature file by Mark Salyzyn · 9 years ago
  78. ae84704 logcat: add --id=<id> for -f option by Mark Salyzyn · 9 years ago
  79. b9d06a2 logcat: switch to android::base::StringPrintf by Mark Salyzyn · 9 years ago
  80. a96be67 logcatd: logpersist.start more descriptive warning by Mark Salyzyn · 9 years ago
  81. e1a5f6c logd: klogd crash by Mark Salyzyn · 9 years ago
  82. 7dce1ce SharedBuffer: Fix bug in return value of release() by Greg Kaiser · 9 years ago
  83. 3ed07f4 libcrypto_utils: convert to Soong. by Josh Gao · 9 years ago
  84. bc808b1 Merge changes from topic 'minui_sync_wait' am: 9cd828b858 am: 70f9a1018c by Greg Hackmann · 9 years ago
  85. c869d01 Merge changes from topic 'minui_sync_wait' am: 9cd828b858 am: 70f9a1018c by Greg Hackmann · 9 years ago
  86. 248795f Merge changes from topic 'minui_sync_wait' am: 9cd828b858 by Greg Hackmann · 9 years ago
  87. 58b6746 Merge changes from topic 'minui_sync_wait' by Treehugger Robot · 9 years ago
  88. e57f9e5 libsync: add static library for recovery by Greg Hackmann · 9 years ago
  89. 75fe6ad libsync: remove unused liblog dependency by Greg Hackmann · 9 years ago
  90. 5e65aa9 adb: correctly fix merge conflict. am: 1286c1f878 am: d067dcdaa3 by Josh Gao · 9 years ago
  91. 4c2b1f4 adb: correctly fix merge conflict. am: 1286c1f878 by Josh Gao · 9 years ago
  92. 6f69355 adb: correctly fix merge conflict. by Josh Gao · 9 years ago
  93. 7adf406 resolve merge conflicts of e012de5 to stage-aosp-master am: 4ff7f9f62a by Josh Gao · 9 years ago
  94. 89df4b6 resolve merge conflicts of e012de5 to stage-aosp-master am: 4ff7f9f62a by Josh Gao · 9 years ago
  95. b33190f resolve merge conflicts of e012de5 to stage-aosp-master by Josh Gao · 9 years ago
  96. dc814fd Merge changes If2f3008f,Id3411479,I90df5fc1 by Treehugger Robot · 9 years ago
  97. 3fcc7d7 adb: improve display of transfer rate. by Josh Gao · 9 years ago
  98. c82b93a Merge "Move init's kernel logging into libbase." am: bfb89d32f5 am: d7c6ac024c by Elliott Hughes · 9 years ago
  99. c02b3e2 Move init's kernel logging into libbase. am: 7bc87a5a78 am: e2a7eb17b5 by Elliott Hughes · 9 years ago
  100. a1572f1 Merge "Move init's kernel logging into libbase." am: bfb89d32f5 am: d7c6ac024c by Elliott Hughes · 9 years ago