1. 6228aed resolve merge conflicts of 1b9b273 to stage-aosp-master am: dba909bd9e by Jorge Lucangeli Obes · 9 years ago
  2. 8857d7e logpersist: incorporate size and buffer tunables am: 515f091f5e -s ours by Mark Salyzyn · 9 years ago
  3. 016cd49 resolve merge conflicts of 1b9b273 to stage-aosp-master am: dba909bd9e by Jorge Lucangeli Obes · 9 years ago
  4. 4079f4d Revert \"logd: logcat -L takes longer causing vold to timeout.\" by Thierry Strudel · 9 years ago
  5. d5b2947 logpersist: incorporate size and buffer tunables by Mark Salyzyn · 9 years ago
  6. 17ea7ed Revert "logd: logcat -L takes longer causing vold to timeout." by Thierry Strudel · 9 years ago
  7. 78daa72 resolve merge conflicts of 1b9b273 to stage-aosp-master by Jorge Lucangeli Obes · 9 years ago
  8. d392bea Merge "Extract the FUSE implementation from the main sdcard.c file." by Treehugger Robot · 9 years ago
  9. 1d5f292 Merge \\\"[mips] Resolve issue with .align directive, when using clang IAS\\\" am: 6b82eec610 am: 79233b4169 by Lazar Trsic · 9 years ago
  10. b8b4efa Merge \\"[mips] Resolve issue with .align directive, when using clang IAS\\" am: 6b82eec610 by Lazar Trsic · 9 years ago
  11. b99894e Merge \"[mips] Resolve issue with .align directive, when using clang IAS\" by Lazar Trsic · 9 years ago
  12. 4171086 Merge "[mips] Resolve issue with .align directive, when using clang IAS" by Treehugger Robot · 9 years ago
  13. 5a4e670 Merge \\\"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: 3ba829c75c am: 6fb57f996a by Mark Salyzyn · 9 years ago
  14. bfc0429 Merge \\"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: 3ba829c75c by Mark Salyzyn · 9 years ago
  15. 10d22a6 Merge \"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\" by Mark Salyzyn · 9 years ago
  16. a07c7b6 Merge "logcatd: trampoline persist.logd.logpersistd to logd.logpersistd" by Treehugger Robot · 9 years ago
  17. bc7b52c [mips] Resolve issue with .align directive, when using clang IAS by Lazar Trsic · 9 years ago
  18. 5a86291 Extract the FUSE implementation from the main sdcard.c file. by Jorge Lucangeli Obes · 9 years ago
  19. 43aa34c Merge "Revert \\\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5 -s ours am: 01799f4381 am: 83df11fe0d" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  20. b470c89 Revert \\\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5 -s ours am: 01799f4381 by Sergio Giro · 9 years ago
  21. 9136ff0 Revert \\\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5 -s ours am: 01799f4381 by Sergio Giro · 9 years ago
  22. 4a97b15 Revert \\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5 -s ours by Sergio Giro · 9 years ago
  23. a8701fa Revert \\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5 -s ours by Sergio Giro · 9 years ago
  24. 49ddaeb Revert \\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf by Sergio Giro · 9 years ago
  25. a8c11dc Revert \\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d by Sergio Giro · 9 years ago
  26. 33accb4 Revert \\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 by Sergio Giro · 9 years ago
  27. df6e579 Revert \\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 by Sergio Giro · 9 years ago
  28. 68e65e9 Revert \\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 by Sergio Giro · 9 years ago
  29. 96a63bb Revert \\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 by Sergio Giro · 9 years ago
  30. 80473d5 Revert \\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 by Sergio Giro · 9 years ago
  31. 37826f5 Revert \\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d by Sergio Giro · 9 years ago
  32. 605de74 Revert \\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\" am: 311002936e am: ddd0051968 by Sergio Giro · 9 years ago
  33. b218b2d Revert \\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" am: 311002936e by Sergio Giro · 9 years ago
  34. ddd0051 Revert \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" by Sergio Giro · 9 years ago
  35. 3110029 Revert "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" by Sergio Giro · 9 years ago
  36. c1acf68 Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe am: 17cd63d00a -s ours am: b4c163b7b1 am: 127876e0c6" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  37. 45d6533 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe am: 17cd63d00a -s ours am: b4c163b7b1 by Sergio Giro · 9 years ago
  38. 23c27b9 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe am: 17cd63d00a -s ours am: b4c163b7b1 by Sergio Giro · 9 years ago
  39. fd56d72 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe am: 17cd63d00a -s ours by Sergio Giro · 9 years ago
  40. 74eedca libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe am: 17cd63d00a -s ours by Sergio Giro · 9 years ago
  41. cc96df2 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe by Sergio Giro · 9 years ago
  42. 750a013 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 by Sergio Giro · 9 years ago
  43. bd63298 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 by Sergio Giro · 9 years ago
  44. caa0cee libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 by Sergio Giro · 9 years ago
  45. 6949822 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 by Sergio Giro · 9 years ago
  46. 8cd7114 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 by Sergio Giro · 9 years ago
  47. 5e4ebd0 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef by Sergio Giro · 9 years ago
  48. 498ffa6 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 by Sergio Giro · 9 years ago
  49. fd7bd2d libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c by Sergio Giro · 9 years ago
  50. 29ccafe libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 by Sergio Giro · 9 years ago
  51. 41e6690 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 by Sergio Giro · 9 years ago
  52. 631ca51 Merge \\\"libutils: Limit integer sanitize to target only\\\" am: fc36f6fab6 am: 8333a913b8 by Dan Willemsen · 9 years ago
  53. 821e0ed Merge \\"libutils: Limit integer sanitize to target only\\" am: fc36f6fab6 by Dan Willemsen · 9 years ago
  54. f85f66b Merge \"libutils: Limit integer sanitize to target only\" am: fc36f6fab6 by Dan Willemsen · 9 years ago
  55. bdff6b6 Merge "libutils: Limit integer sanitize to target only" by Treehugger Robot · 9 years ago
  56. 96f3af0 resolve merge conflicts of 41e82a3 to stage-aosp-master am: 2fedbf79bb by Colin Cross · 9 years ago
  57. f3a0095 resolve merge conflicts of 41e82a3 to stage-aosp-master am: 2fedbf79bb by Colin Cross · 9 years ago
  58. f36af52 libutils: Limit integer sanitize to target only by Dan Willemsen · 9 years ago
  59. 7c4c2e0 resolve merge conflicts of 41e82a3 to stage-aosp-master by Colin Cross · 9 years ago
  60. 6ab82b8 Merge changes I6f0df904,I8b578f67 by Colin Cross · 9 years ago
  61. ee48bfd Convert libziparchive from Android.mk to Android.bp by Colin Cross · 9 years ago
  62. 1e049f9 Merge \\\"libcutils: Switch to Android.bp\\\" am: bc6c52f905 am: 4e8bb3e677 by Dan Willemsen · 9 years ago
  63. a343b8c Merge \\"libcutils: Switch to Android.bp\\" am: bc6c52f905 am: 4e8bb3e677 by Dan Willemsen · 9 years ago
  64. 80d5106 Merge \"libcutils: Switch to Android.bp\" am: bc6c52f905 by Dan Willemsen · 9 years ago
  65. 2c214d4 Merge "libcutils: Switch to Android.bp" by Treehugger Robot · 9 years ago
  66. 0dd7332 Convert libbacktrace, libutils to Soong by Dan Willemsen · 9 years ago
  67. a55c441 libcutils: Switch to Android.bp by Dan Willemsen · 9 years ago
  68. 53473c1 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 by Sergio Giro · 9 years ago
  69. 7dd38c9 Merge \\\"Rename Android.soong.mk to Android.mk\\\" am: b07df4dd3f am: 68bfe51348 by Colin Cross · 9 years ago
  70. c2801a0 Merge \\"Rename Android.soong.mk to Android.mk\\" am: b07df4dd3f am: 68bfe51348 by Colin Cross · 9 years ago
  71. 8e1ac5a Merge \"Rename Android.soong.mk to Android.mk\" am: b07df4dd3f by Colin Cross · 9 years ago
  72. 4cbf0a0 Merge "Rename Android.soong.mk to Android.mk" by Colin Cross · 9 years ago
  73. d290923 Merge "Merge \\\"RefBase: Silence compiler warnings\\\" am: f76ca2a43b am: 3b43562535 am: 0c9b9ec4dc" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  74. 242d6d4 Merge "Merge \\\"Convert libbase Android.mk to Android.bp\\\" am: df252716f6 am: 3407c053c3 am: c5ba0110d4" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  75. 3990f6a Merge \\\"RefBase: Silence compiler warnings\\\" am: f76ca2a43b am: 3b43562535 by Greg Kaiser · 9 years ago
  76. 378c5a6 Merge \\\"Convert libbase Android.mk to Android.bp\\\" am: df252716f6 am: 3407c053c3 by Colin Cross · 9 years ago
  77. bd78afd Merge \"Remove attempt to write sched_compat_yield\" into nyc-mr1-dev by Tim Kryger · 9 years ago
  78. c182737 Merge \\"RefBase: Silence compiler warnings\\" am: f76ca2a43b am: 3b43562535 by Greg Kaiser · 9 years ago
  79. 7359e4c Merge \\"Convert libbase Android.mk to Android.bp\\" am: df252716f6 by Colin Cross · 9 years ago
  80. 0844b41 Merge \"RefBase: Silence compiler warnings\" am: f76ca2a43b by Greg Kaiser · 9 years ago
  81. 753c702 Merge \"Convert libbase Android.mk to Android.bp\" am: df252716f6 by Colin Cross · 9 years ago
  82. eb87d43 Merge "RefBase: Silence compiler warnings" by Treehugger Robot · 9 years ago
  83. 965a5d7 Merge "Convert libbase Android.mk to Android.bp" by Treehugger Robot · 9 years ago
  84. c4bc7c3 Merge "Remove attempt to write sched_compat_yield" into nyc-mr1-dev by TreeHugger Robot · 9 years ago
  85. 1ccc94f Rename Android.soong.mk to Android.mk by Colin Cross · 9 years ago
  86. 69e2d10 Merge \"Add support for background stune group.\" into nyc-mr1-dev by Tim Murray · 9 years ago
  87. b669730 Merge "Add support for background stune group." into nyc-mr1-dev by Tim Murray · 9 years ago
  88. c6044e3 RefBase: Silence compiler warnings by Greg Kaiser · 9 years ago
  89. 1eaade2 Merge \"init.rc: Remove cpu weight set on the root cgroup\" into nyc-mr1-dev by Irina Patru · 9 years ago
  90. 8d0c44e Remove attempt to write sched_compat_yield by Tim Kryger · 9 years ago
  91. 13928be Merge "init.rc: Remove cpu weight set on the root cgroup" into nyc-mr1-dev by TreeHugger Robot · 9 years ago
  92. 952354c Merge \\\"Remove attempt to write sched_compat_yield\\\" am: 3f2db32b8c am: 49a986bf73 by Tim Kryger · 9 years ago
  93. 84a2341 Merge \\"Remove attempt to write sched_compat_yield\\" am: 3f2db32b8c by Tim Kryger · 9 years ago
  94. d415a77 Merge \"Remove attempt to write sched_compat_yield\" am: 3f2db32b8c by Tim Kryger · 9 years ago
  95. 600e9eb Merge "Remove attempt to write sched_compat_yield" by Tim Kryger · 9 years ago
  96. 67cb67f Convert libbase Android.mk to Android.bp by Colin Cross · 9 years ago
  97. 5f09d40 resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d by Elliott Hughes · 9 years ago
  98. a545941 resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d by Elliott Hughes · 9 years ago
  99. 278574f resolve merge conflicts of 743b0c5 to stage-aosp-master by Elliott Hughes · 9 years ago
  100. de048ec Add support for background stune group. by Tim Murray · 9 years ago