1. 016cd49 resolve merge conflicts of 1b9b273 to stage-aosp-master am: dba909bd9e by Jorge Lucangeli Obes · 9 years ago
  2. 78daa72 resolve merge conflicts of 1b9b273 to stage-aosp-master by Jorge Lucangeli Obes · 9 years ago
  3. d392bea Merge "Extract the FUSE implementation from the main sdcard.c file." by Treehugger Robot · 9 years ago
  4. b8b4efa Merge \\"[mips] Resolve issue with .align directive, when using clang IAS\\" am: 6b82eec610 by Lazar Trsic · 9 years ago
  5. b99894e Merge \"[mips] Resolve issue with .align directive, when using clang IAS\" by Lazar Trsic · 9 years ago
  6. 4171086 Merge "[mips] Resolve issue with .align directive, when using clang IAS" by Treehugger Robot · 9 years ago
  7. bfc0429 Merge \\"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: 3ba829c75c by Mark Salyzyn · 9 years ago
  8. 10d22a6 Merge \"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\" by Mark Salyzyn · 9 years ago
  9. a07c7b6 Merge "logcatd: trampoline persist.logd.logpersistd to logd.logpersistd" by Treehugger Robot · 9 years ago
  10. bc7b52c [mips] Resolve issue with .align directive, when using clang IAS by Lazar Trsic · 9 years ago
  11. 5a86291 Extract the FUSE implementation from the main sdcard.c file. by Jorge Lucangeli Obes · 9 years ago
  12. 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
  13. 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
  14. 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
  15. 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
  16. 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
  17. 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
  18. 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
  19. 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
  20. 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
  21. 605de74 Revert \\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\" am: 311002936e am: ddd0051968 by Sergio Giro · 9 years ago
  22. b218b2d Revert \\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" am: 311002936e by Sergio Giro · 9 years ago
  23. ddd0051 Revert \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" by Sergio Giro · 9 years ago
  24. 3110029 Revert "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" by Sergio Giro · 9 years ago
  25. 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
  26. 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
  27. 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
  28. 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
  29. 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
  30. 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
  31. 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
  32. 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
  33. 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
  34. fd7bd2d libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c by Sergio Giro · 9 years ago
  35. 29ccafe libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 by Sergio Giro · 9 years ago
  36. 41e6690 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 by Sergio Giro · 9 years ago
  37. 821e0ed Merge \\"libutils: Limit integer sanitize to target only\\" am: fc36f6fab6 by Dan Willemsen · 9 years ago
  38. f85f66b Merge \"libutils: Limit integer sanitize to target only\" am: fc36f6fab6 by Dan Willemsen · 9 years ago
  39. bdff6b6 Merge "libutils: Limit integer sanitize to target only" by Treehugger Robot · 9 years ago
  40. f3a0095 resolve merge conflicts of 41e82a3 to stage-aosp-master am: 2fedbf79bb by Colin Cross · 9 years ago
  41. f36af52 libutils: Limit integer sanitize to target only by Dan Willemsen · 9 years ago
  42. 7c4c2e0 resolve merge conflicts of 41e82a3 to stage-aosp-master by Colin Cross · 9 years ago
  43. 6ab82b8 Merge changes I6f0df904,I8b578f67 by Colin Cross · 9 years ago
  44. ee48bfd Convert libziparchive from Android.mk to Android.bp by Colin Cross · 9 years ago
  45. a343b8c Merge \\"libcutils: Switch to Android.bp\\" am: bc6c52f905 am: 4e8bb3e677 by Dan Willemsen · 9 years ago
  46. 80d5106 Merge \"libcutils: Switch to Android.bp\" am: bc6c52f905 by Dan Willemsen · 9 years ago
  47. 2c214d4 Merge "libcutils: Switch to Android.bp" by Treehugger Robot · 9 years ago
  48. 0dd7332 Convert libbacktrace, libutils to Soong by Dan Willemsen · 9 years ago
  49. a55c441 libcutils: Switch to Android.bp by Dan Willemsen · 9 years ago
  50. 53473c1 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 by Sergio Giro · 9 years ago
  51. c2801a0 Merge \\"Rename Android.soong.mk to Android.mk\\" am: b07df4dd3f am: 68bfe51348 by Colin Cross · 9 years ago
  52. 8e1ac5a Merge \"Rename Android.soong.mk to Android.mk\" am: b07df4dd3f by Colin Cross · 9 years ago
  53. 4cbf0a0 Merge "Rename Android.soong.mk to Android.mk" by Colin Cross · 9 years ago
  54. c182737 Merge \\"RefBase: Silence compiler warnings\\" am: f76ca2a43b am: 3b43562535 by Greg Kaiser · 9 years ago
  55. 7359e4c Merge \\"Convert libbase Android.mk to Android.bp\\" am: df252716f6 by Colin Cross · 9 years ago
  56. 0844b41 Merge \"RefBase: Silence compiler warnings\" am: f76ca2a43b by Greg Kaiser · 9 years ago
  57. 753c702 Merge \"Convert libbase Android.mk to Android.bp\" am: df252716f6 by Colin Cross · 9 years ago
  58. eb87d43 Merge "RefBase: Silence compiler warnings" by Treehugger Robot · 9 years ago
  59. 965a5d7 Merge "Convert libbase Android.mk to Android.bp" by Treehugger Robot · 9 years ago
  60. 1ccc94f Rename Android.soong.mk to Android.mk by Colin Cross · 9 years ago
  61. c6044e3 RefBase: Silence compiler warnings by Greg Kaiser · 9 years ago
  62. 84a2341 Merge \\"Remove attempt to write sched_compat_yield\\" am: 3f2db32b8c by Tim Kryger · 9 years ago
  63. d415a77 Merge \"Remove attempt to write sched_compat_yield\" am: 3f2db32b8c by Tim Kryger · 9 years ago
  64. 600e9eb Merge "Remove attempt to write sched_compat_yield" by Tim Kryger · 9 years ago
  65. 67cb67f Convert libbase Android.mk to Android.bp by Colin Cross · 9 years ago
  66. a545941 resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d by Elliott Hughes · 9 years ago
  67. 278574f resolve merge conflicts of 743b0c5 to stage-aosp-master by Elliott Hughes · 9 years ago
  68. 6590b9d Merge "Switch run-as to libpackagelistparser." by Elliott Hughes · 9 years ago
  69. df5b742 Remove attempt to write sched_compat_yield by Tim Kryger · 9 years ago
  70. 76c31df Merge \\"Refactor Service::Start method.\\" am: 82d2bcc21e am: f2ffdac47a by Jorge Lucangeli Obes · 9 years ago
  71. 082cfc0 Merge \"Refactor Service::Start method.\" am: 82d2bcc21e by Jorge Lucangeli Obes · 9 years ago
  72. 48a9849 Merge "Refactor Service::Start method." by Treehugger Robot · 9 years ago
  73. 8737af0 Refactor Service::Start method. by Jorge Lucangeli Obes · 9 years ago
  74. 1431e2e Merge \\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\" am: 5d420e791b by Dan Willemsen · 9 years ago
  75. bd98b7c Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\" by Dan Willemsen · 9 years ago
  76. 77109ef Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence" by Dan Willemsen · 9 years ago
  77. 31ddaed Use BOARD_USES_VENDORIMAGE to detect vendor image presence by Dan Willemsen · 9 years ago
  78. e439826 logcatd: trampoline persist.logd.logpersistd to logd.logpersistd by Mark Salyzyn · 9 years ago
  79. 57f46e2 Merge \\"Make klog_fd thread-safe and make klog_init a no-op.\\" am: 588b770063 by Elliott Hughes · 9 years ago
  80. 21ab2be Merge \"Make klog_fd thread-safe and make klog_init a no-op.\" am: 588b770063 by Elliott Hughes · 9 years ago
  81. bb5a941 Merge "Make klog_fd thread-safe and make klog_init a no-op." by Elliott Hughes · 9 years ago
  82. d91f7cb Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2 by Erik Kline · 9 years ago
  83. 7b31d73 Merge \"Add UIDs for system DNS and tethering DNS\" am: c4dc4f3fc2 by Erik Kline · 9 years ago
  84. 4e2587e Merge "Add UIDs for system DNS and tethering DNS" by Treehugger Robot · 9 years ago
  85. 453674c Switch run-as to libpackagelistparser. by Elliott Hughes · 9 years ago
  86. a92c250 Merge \\"logcat: help spelling correction\\" am: 20a172fca7 am: 59cce987ec by Mark Salyzyn · 9 years ago
  87. 4bdd61a Merge \"logcat: help spelling correction\" am: 20a172fca7 by Mark Salyzyn · 9 years ago
  88. 8c691d8 Merge "logcat: help spelling correction" by Treehugger Robot · 9 years ago
  89. 838f07d logcat: help spelling correction by Mark Salyzyn · 9 years ago
  90. 2b5c4d3 Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a03 am: b13d0ce160 by Mark Salyzyn · 9 years ago
  91. ad33d2d Merge \"logcat: format verbs and adverbs\" am: 82fb012a03 by Mark Salyzyn · 9 years ago
  92. 6be70d1 Merge "logcat: format verbs and adverbs" by Treehugger Robot · 9 years ago
  93. 6a08512 Merge \\"libcutils: canned_fs_config.c drop tabs\\" am: 4ee9ed5366 by Mark Salyzyn · 9 years ago
  94. 4fa152d Merge \"libcutils: canned_fs_config.c drop tabs\" am: 4ee9ed5366 by Mark Salyzyn · 9 years ago
  95. e281282 Merge "libcutils: canned_fs_config.c drop tabs" by Treehugger Robot · 9 years ago
  96. c4b4265 logcat: format verbs and adverbs by Mark Salyzyn · 9 years ago
  97. fe03fdb libcutils: canned_fs_config.c drop tabs by Mark Salyzyn · 9 years ago
  98. 09f3134 Add UIDs for system DNS and tethering DNS by Erik Kline · 9 years ago
  99. c627a96 Merge \\"Fix the generated getevent labels.\\" am: 80beb506cf am: 2f589bf974 by Elliott Hughes · 9 years ago
  100. 6e7f36d Merge \"Fix the generated getevent labels.\" am: 80beb506cf by Elliott Hughes · 9 years ago