1. f846ffc resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp by Ed Tam · 10 years ago
  2. 7e0e4d2 am c9fc3db5: am 7746546b: Merge "logcat: build regression" by Mark Salyzyn · 10 years ago
  3. 71d62f2 am 7746546b: Merge "logcat: build regression" by Mark Salyzyn · 10 years ago
  4. 187113c Merge "logcat: build regression" by Mark Salyzyn · 10 years ago
  5. 2e4282a logcat: build regression by Mark Salyzyn · 10 years ago
  6. fb2ead8 am 7249f69a: am b9a41bdb: Merge "logcat: Minor fixes" by Mark Salyzyn · 10 years ago
  7. 49eaf44 am b9a41bdb: Merge "logcat: Minor fixes" by Mark Salyzyn · 10 years ago
  8. c4c8f13 Merge "logcat: Minor fixes" by Mark Salyzyn · 10 years ago
  9. ef74898 am 3c5e3a82: am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480d by Mark Salyzyn · 10 years ago
  10. 4bde552 am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480d by Mark Salyzyn · 10 years ago
  11. b2696f5 Merge changes Iddd45a67,Ifdc20b09,Ibc68480d by Mark Salyzyn · 10 years ago
  12. 4dc9862 am 532d0a11: am 9b83b623: Merge "Executable to run on boot that removes old tzdata if needed" by Neil Fuller · 10 years ago
  13. 78fd3a7 am 9b83b623: Merge "Executable to run on boot that removes old tzdata if needed" by Neil Fuller · 10 years ago
  14. 5a669f2 Merge "Executable to run on boot that removes old tzdata if needed" by Neil Fuller · 10 years ago
  15. facfa6e Executable to run on boot that removes old tzdata if needed by Neil Fuller · 10 years ago
  16. a480816 logcat: Minor fixes by Traian Schiau · 10 years ago
  17. 54eb6b9 logd: disable worst uid prune for events buffer by Mark Salyzyn · 10 years ago
  18. 0e0012c Revert: "logd: default off by-UID spam filter" by Mark Salyzyn · 11 years ago
  19. 5bc66c6 logd: annotate worst-UID pruned entries by Mark Salyzyn · 10 years ago
  20. 79f3384 fs_mgr: introduce fs_mgr_format to format wiped partitions by Chris Fries · 12 years ago
  21. 53d9619 am 1110aa78: am 65937e9b: Merge "Prevent unaligned read in libziparchive." by Dan Albert · 10 years ago
  22. 4b37b22 am 65937e9b: Merge "Prevent unaligned read in libziparchive." by Dan Albert · 10 years ago
  23. 0936022 Merge "Prevent unaligned read in libziparchive." by Dan Albert · 10 years ago
  24. 3591063 am 8f6dfc7d: am e65c2210: Merge "log: Add check for LINT_RLOG" by Mark Salyzyn · 10 years ago
  25. 2a2b01d am e65c2210: Merge "log: Add check for LINT_RLOG" by Mark Salyzyn · 10 years ago
  26. 3b6c92e Merge "log: Add check for LINT_RLOG" by Mark Salyzyn · 10 years ago
  27. 04067d6 log: Add check for LINT_RLOG by Mark Salyzyn · 10 years ago
  28. 39412e2 am 486b8de7: am 03a03401: Merge "Add base/memory.h." by Dan Albert · 10 years ago
  29. 6071c83 am 03a03401: Merge "Add base/memory.h." by Dan Albert · 10 years ago
  30. 334717f Merge "Add base/memory.h." by Dan Albert · 10 years ago
  31. feb88e2 Prevent unaligned read in libziparchive. by Dan Albert · 10 years ago
  32. 9b0841e Add base/memory.h. by Dan Albert · 10 years ago
  33. 406c159 am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" by Mohamad Ayyash · 10 years ago
  34. f034517 am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" by Mohamad Ayyash · 10 years ago
  35. 2b4607c Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" by Mohamad Ayyash · 10 years ago
  36. 2b24f13 Revert "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 10 years ago
  37. 196a780 am 5dd81c93: am d67ff2d5: Merge "Move ls implementation detail into ls." by Elliott Hughes · 10 years ago
  38. 01bd4e8 am d67ff2d5: Merge "Move ls implementation detail into ls." by Elliott Hughes · 10 years ago
  39. 5c8bb52 Merge "Move ls implementation detail into ls." by Elliott Hughes · 10 years ago
  40. a32fbd0 am 463913e6: am e74baca6: Merge "logd: Build Breakage" by Mark Salyzyn · 10 years ago
  41. 485db9d am 45b83835: am 82d11859: Merge "logd: uidToName improvement" by Mark Salyzyn · 10 years ago
  42. bf66c77 am d8ff56c9: am c3d40b86: Merge "logd: Add Pid statistics" by Mark Salyzyn · 10 years ago
  43. 85fe015 am e74baca6: Merge "logd: Build Breakage" by Mark Salyzyn · 10 years ago
  44. 1306481 am 82d11859: Merge "logd: uidToName improvement" by Mark Salyzyn · 10 years ago
  45. 53edcc5 am c3d40b86: Merge "logd: Add Pid statistics" by Mark Salyzyn · 10 years ago
  46. 3a08416 Merge "logd: Build Breakage" by Mark Salyzyn · 10 years ago
  47. 403951c logd: Build Breakage by Mark Salyzyn · 10 years ago
  48. 089664f Merge "logd: uidToName improvement" by Mark Salyzyn · 10 years ago
  49. af40948 Merge "logd: Add Pid statistics" by Mark Salyzyn · 10 years ago
  50. e8596d1 logd: uidToName improvement by Mark Salyzyn · 10 years ago
  51. 48c526c logd: Add Pid statistics by Mark Salyzyn · 10 years ago
  52. 9438469 am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 10 years ago
  53. 8f8d00d am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 10 years ago
  54. 56f72c8 am 6e73780b: am 74a18757: Merge "Lose getprop to toybox." by Elliott Hughes · 10 years ago
  55. 8c444ee am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 10 years ago
  56. 24dd031 Merge "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 10 years ago
  57. 3fec2ff Revert "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 10 years ago
  58. a572082 am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 10 years ago
  59. cb60b5d Merge "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 10 years ago
  60. dde6bf1 Move ls implementation detail into ls. by Elliott Hughes · 10 years ago
  61. c868fcf am 74a18757: Merge "Lose getprop to toybox." by Elliott Hughes · 10 years ago
  62. 0722637 Merge "Lose getprop to toybox." by Elliott Hughes · 10 years ago
  63. 78eb7f6 am 07e3ed46: am c19572fa: Merge "rootfs: init start logd in post-fs" by Mark Salyzyn · 10 years ago
  64. f3c0795 am c19572fa: Merge "rootfs: init start logd in post-fs" by Mark Salyzyn · 10 years ago
  65. 423f70d Merge "rootfs: init start logd in post-fs" by Mark Salyzyn · 10 years ago
  66. 2cf3123 rootfs: init start logd in post-fs by Mark Salyzyn · 10 years ago
  67. 43d4aac Lose getprop to toybox. by Elliott Hughes · 10 years ago
  68. 22505e2 am 6994d3fa: am bf403968: Merge "Lose setprop to toybox." by Elliott Hughes · 10 years ago
  69. a9e6e11 am bf403968: Merge "Lose setprop to toybox." by Elliott Hughes · 10 years ago
  70. 92702d4 Merge "Lose setprop to toybox." by Elliott Hughes · 10 years ago
  71. 2aacdc5 am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server" by Nick Kralevich · 10 years ago
  72. 2a26f4a am de957955: Merge "Create /data/system/heapdump for system_server" by Nick Kralevich · 10 years ago
  73. 2a4c060 Merge "Create /data/system/heapdump for system_server" by Nick Kralevich · 10 years ago
  74. 67d1a17 Create /data/system/heapdump for system_server by Nick Kralevich · 10 years ago
  75. 615e3b6 am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox." by Elliott Hughes · 10 years ago
  76. ef6f10c Lose setprop to toybox. by Elliott Hughes · 10 years ago
  77. 6484cd0 am 5ae7b1e5: Merge "Lose restorecon to toybox." by Elliott Hughes · 10 years ago
  78. 44002bd Merge "Lose restorecon to toybox." by Elliott Hughes · 10 years ago
  79. f0720fe Lose restorecon to toybox. by Elliott Hughes · 10 years ago
  80. 286fc4f am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct" by Nick Kralevich · 10 years ago
  81. 161f560 am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct" by Nick Kralevich · 10 years ago
  82. 300dee2 Merge "logd: Don't embed a flexible array member within another struct" by Nick Kralevich · 10 years ago
  83. 90cb3d6 logd: Don't embed a flexible array member within another struct by Nick Kralevich · 10 years ago
  84. 3bea3de am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed" by Sami Tolvanen · 10 years ago
  85. 2c6e95b am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value" by Sami Tolvanen · 10 years ago
  86. 2e8b734 am 02f1d80a: Merge "Restore verity state when verified partition is reflashed" by Sami Tolvanen · 10 years ago
  87. 1590994 am 284c5cb2: Merge "Set verity mode as the verified property value" by Sami Tolvanen · 10 years ago
  88. 240bc9c Merge "Restore verity state when verified partition is reflashed" by Sami Tolvanen · 10 years ago
  89. 491ad6e Merge "Set verity mode as the verified property value" by Sami Tolvanen · 10 years ago
  90. ff11bdd fs_mgr_verity: Add support for squashfs by Mohamad Ayyash · 10 years ago
  91. a7c1cd0 am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS" by Mark Salyzyn · 10 years ago
  92. cd2e4f6 am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS" by Mark Salyzyn · 10 years ago
  93. fd77d87 Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS" by Mark Salyzyn · 10 years ago
  94. 47f7ed8 android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS by Mark Salyzyn · 10 years ago
  95. 1d5e0c1 DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces by Eino-Ville Talvala · 10 years ago
  96. a75b995 am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master by Dan Stoza · 10 years ago
  97. d6110d2 am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." by Mark Salyzyn · 10 years ago
  98. 6a8fcb1 Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master by Dan Stoza · 10 years ago
  99. 707c6ea am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." by Mark Salyzyn · 10 years ago
  100. 0ca6796 Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." by Mark Salyzyn · 10 years ago