1. dff7286 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours am: 75708e52d3 am: 512b191d80 -s ours am: 8a7a944fd3 by Josh Gao · 9 years ago
  2. 3e88ae8 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours am: 75708e52d3 am: 512b191d80 -s ours by Josh Gao · 9 years ago
  3. 8f621db resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b am: c663d0482b am: 92e0f8f49d by Josh Gao · 9 years ago
  4. 79735c8 resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b am: c663d0482b by Josh Gao · 9 years ago
  5. 4c4681e resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours am: 75708e52d3 by Josh Gao · 9 years ago
  6. b7b4879 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours by Josh Gao · 9 years ago
  7. 0f45718 resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b by Josh Gao · 9 years ago
  8. da10975 resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 by Josh Gao · 9 years ago
  9. 75708e5 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 by Josh Gao · 9 years ago
  10. b97b07e resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 by Josh Gao · 9 years ago
  11. 9cde309 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours by Josh Gao · 9 years ago
  12. 1eb6ec5 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE by Josh Gao · 9 years ago
  13. 7e10520 resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours by Josh Gao · 9 years ago
  14. adc3bcb resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours by Josh Gao · 9 years ago
  15. bdfb431 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE by Josh Gao · 9 years ago
  16. f7208a0 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851 am: 75ccd732f3 -s ours am: 505a431468 am: b760e61686 -s ours am: d5cb8b417b by Nick Kralevich · 9 years ago
  17. 91b48c3 resolve merge conflicts of 9515c23e16 to klp-modular-dev by Josh Gao · 9 years ago
  18. ef59a00 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851 am: 75ccd732f3 -s ours am: 505a431468 am: b760e61686 -s ours by Nick Kralevich · 9 years ago
  19. d51c25e Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 am: 0cf99e2b61 am: 338f1802ee am: 3ee4a0be2a by Josh Gao · 9 years ago
  20. f5ca0f4 ensure /data/tombstones exists on all Android devices am: e2796207ee am: 9660c6759e am: 4d4eb0db97 am: 6d7ce7b14c am: 077a9ffe40 by Nick Kralevich · 9 years ago
  21. a7d5bdb ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851 am: 75ccd732f3 -s ours am: 505a431468 by Nick Kralevich · 9 years ago
  22. 0675af8 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851 am: 75ccd732f3 -s ours by Nick Kralevich · 9 years ago
  23. e8a5432 Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 am: 0cf99e2b61 am: 338f1802ee by Josh Gao · 9 years ago
  24. 60670e3 ensure /data/tombstones exists on all Android devices am: e2796207ee am: 9660c6759e am: 4d4eb0db97 am: 6d7ce7b14c by Nick Kralevich · 9 years ago
  25. 6418fc2 Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 am: 0cf99e2b61 by Josh Gao · 9 years ago
  26. 505a431 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851 by Nick Kralevich · 9 years ago
  27. cad43eb ensure /data/tombstones exists on all Android devices am: e2796207ee am: 9660c6759e am: 4d4eb0db97 by Nick Kralevich · 9 years ago
  28. 81c1f10 Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 am: 0cf99e2b61 by Josh Gao · 9 years ago
  29. 75ccd73 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours by Nick Kralevich · 9 years ago
  30. bcdcece ensure /data/tombstones exists on all Android devices am: e2796207ee am: 9660c6759e by Nick Kralevich · 9 years ago
  31. d61ebb0 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 by Nick Kralevich · 9 years ago
  32. 0cf99e2 Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616 by Josh Gao · 9 years ago
  33. 4d4eb0d ensure /data/tombstones exists on all Android devices am: e2796207ee by Nick Kralevich · 9 years ago
  34. c61a896 ensure /data/tombstones exists on all Android device. DO NOT MERGE by Nick Kralevich · 9 years ago
  35. 99b8a56 Don\'t create tombstone directory. am: cb9625cbe5 by Josh Gao · 9 years ago
  36. 9660c67 ensure /data/tombstones exists on all Android devices am: e2796207ee by Nick Kralevich · 9 years ago
  37. a177216 Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4 -s ours am: 43c0f28c11 by William Luh · 9 years ago
  38. c8ffa48 Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4 -s ours by William Luh · 9 years ago
  39. a3c37dc Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4 -s ours by William Luh · 9 years ago
  40. 54273da Add macro to call event logger for errors. DO NOT MERGE by William Luh · 10 years ago
  41. eac568f Add CASIO to approved vendor IDs by Mohamad Ayyash · 9 years ago
  42. cb9625c Don't create tombstone directory. by Josh Gao · 9 years ago
  43. e279620 ensure /data/tombstones exists on all Android devices by Nick Kralevich · 10 years ago
  44. 557749e Don't create tombstone directory. DO NOT MERGE by Josh Gao · 9 years ago
  45. 9515c23 debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE by Josh Gao · 9 years ago
  46. 9c0ed66 ensure /data/tombstones exists on all Android device. DO NOT MERGE by Nick Kralevich · 10 years ago
  47. bd13e63 Re-derive permissions after package changes. am: a44febd19b by Jeff Sharkey · 9 years ago
  48. 8878208 Re-derive permissions after package changes. by Jeff Sharkey · 9 years ago
  49. 288bec7 Mount debugfs earlier regardless build variant by Ching Tzung Lin · 9 years ago
  50. efd2eeb logcatd: up size from 16MB to 256MB by Alain Vongsouvanh · 10 years ago
  51. 268c500 logcat: continue where we left off by Mark Salyzyn · 10 years ago
  52. cf55f4b Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 am: 088639a20f -s ours by Jon Larimer · 9 years ago
  53. 9a6585e Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours by Jon Larimer · 9 years ago
  54. 1d22e63 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours by Jon Larimer · 9 years ago
  55. 7bc0088 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 by Jon Larimer · 9 years ago
  56. 0c7b1c1 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb by Jon Larimer · 9 years ago
  57. 0464a09 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours by Jon Larimer · 9 years ago
  58. 9739946 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours by Jon Larimer · 9 years ago
  59. 65f3c99 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours by Jon Larimer · 9 years ago
  60. a3f48b3 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev by Jon Larimer · 9 years ago
  61. ea1e6a5 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a by Jon Larimer · 9 years ago
  62. 702fe6d Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours by Jon Larimer · 9 years ago
  63. 362f13d Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 by Jon Larimer · 9 years ago
  64. fd56dc4 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev by Jon Larimer · 9 years ago
  65. 93a3871 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 by Jon Larimer · 9 years ago
  66. b0c301f Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7f by Jon Larimer · 9 years ago
  67. 442a830 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev by Jon Larimer · 9 years ago
  68. 9726d92 Merge "Add macro to call event logger for errors." into mnc-dev by Jon Larimer · 9 years ago
  69. f84eef3 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev by Jon Larimer · 9 years ago
  70. 5280061 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev by Jon Larimer · 9 years ago
  71. 809d5a0 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev by Jon Larimer · 9 years ago
  72. 641f2ff Add macro to call event logger for errors. by William Luh · 10 years ago
  73. 9a86c28 Add macro to call event logger for errors. DO NOT MERGE by William Luh · 10 years ago
  74. f34258f Add macro to call event logger for errors. DO NOT MERGE by William Luh · 10 years ago
  75. 4fd8210 Add macro to call event logger for errors. DO NOT MERGE by William Luh · 10 years ago
  76. 47728a3 Merge "logd: pruning time horizon" into mnc-dr-dev by Mark Salyzyn · 9 years ago
  77. 4aab191 logd: pruning time horizon by Mark Salyzyn · 9 years ago
  78. bc88ff6 Remove __DATE__/__TIME__ from init and debuggerd by Dan Willemsen · 9 years ago
  79. 45888ff Fix incorrect check of descsz value. am: d917514bd6 by Christopher Ferris · 9 years ago
  80. 069fb47 Fix incorrect check of descsz value. by Christopher Ferris · 9 years ago
  81. 847cd9e Merge "Don't show UI on default encryption" into mnc-dr-dev by Paul Lawrence · 9 years ago
  82. 48af00d Reorder init.rc to avoid a kernel warning. by Tim Murray · 9 years ago
  83. e164344 Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev by Ruchi Kandoi · 9 years ago
  84. e1a4252 healthd: Adds fake battery properties for devices with no battery. by Ruchi Kandoi · 10 years ago
  85. 469597a fs_mgr: trigger dm-verity error handling for invalid signatures by Sami Tolvanen · 10 years ago
  86. 9c7e613 Merge "add system-background cpuset" into mnc-dr-dev by Tim Murray · 10 years ago
  87. 024b359 am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. by Narayan Kamath · 10 years ago
  88. e0fe13e am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev by Narayan Kamath · 10 years ago
  89. 7d39b2d am 110f705e: resolved conflicts for 832a0d1c to mnc-dev by Brian Carlstrom · 10 years ago
  90. d014c98 am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. by Narayan Kamath · 10 years ago
  91. 439ab1f am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev by Narayan Kamath · 10 years ago
  92. 96bee4f resolved conflicts for 832a0d1c to mnc-dev by Brian Carlstrom · 10 years ago
  93. 6ed6b3c am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. by Narayan Kamath · 10 years ago
  94. 4222b87 am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev by Narayan Kamath · 10 years ago
  95. cca75cc resolved conflicts for cf676a86 to lmp-mr1-ub-dev by Brian Carlstrom · 10 years ago
  96. 917af6f add system-background cpuset by Tim Murray · 10 years ago
  97. 491035c am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. by Narayan Kamath · 10 years ago
  98. db7d8e9 am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev by Narayan Kamath · 10 years ago
  99. cf676a8 am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl. by Narayan Kamath · 10 years ago
  100. e4ebeb0 Merge "logd: worst uid record watermark part five" into mnc-dr-dev by Mark Salyzyn · 10 years ago