1. 5fb629a resolve merge conflicts of e845c04 to nyc-dev-plus-aosp by Chih-Hung Hsieh · 9 years ago
  2. c713bce Fix misc-macro-parentheses warnings in init and other core modules. by Chih-Hung Hsieh · 9 years ago
  3. 348f359 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 by Badhri Jagan Sridharan · 9 years ago
  4. dfd2478 fs_mgr: update block device reference in verity metadata by Jeremy Compostella · 9 years ago
  5. 2e76205 Merge "If we fail to format a blank partition, try recovery" into nyc-dev by Matthew Bouyack · 9 years ago
  6. 9c59cbc If we fail to format a blank partition, try recovery by Matthew Bouyack · 9 years ago
  7. e992831 Merge "Add nofail fstab option" by Daniel Rosenberg · 9 years ago
  8. 9c4a0e0 Merge changes from topic \'boringssl_conversion\' am: 52eb93c am: 0781351 by Elliott Hughes · 9 years ago
  9. 097b6bb Switch fs_mgr and adb to libcrypto_utils. by Mattias Nissler · 9 years ago
  10. dde4e5a resolve merge conflicts of 2857bd1 to nyc-dev am: e3a3288 by Daniel Rosenberg · 9 years ago
  11. e3a3288 resolve merge conflicts of 2857bd1 to nyc-dev by Daniel Rosenberg · 9 years ago
  12. de551ff Add nofail fstab option by Daniel Rosenberg · 9 years ago
  13. d38e3c5 Add nofail fstab option by Daniel Rosenberg · 9 years ago
  14. 2f5d1da Merge "Revert "Revert "HACK: Run e2fsck with -f""" into nyc-dev am: a1a8a82 by Robb Glasser · 9 years ago
  15. 3fb176c Revert "Revert "HACK: Run e2fsck with -f"" by Robb Glasser · 9 years ago
  16. 131aabd Merge "Revert "HACK: Run e2fsck with -f"" into nyc-dev am: dc6893c by Paul Lawrence · 9 years ago
  17. 07068de Revert "HACK: Run e2fsck with -f" by Paul Lawrence · 9 years ago
  18. 02f689e Merge "Cleanup uses of sprintf so we can deprecate it." am: 2c5b89a64a by George Burgess IV · 9 years ago
  19. e7aa2b2 Cleanup uses of sprintf so we can deprecate it. by George Burgess IV · 9 years ago
  20. bdd5908 Merge "Distinguish between unencrypted and unencryptable" into nyc-dev by Paul Lawrence · 9 years ago
  21. 1098aac Distinguish between unencrypted and unencryptable by Paul Lawrence · 9 years ago
  22. 70c04ec Merge "Revert "Revert "Update make_ext4fs_internal param-list to match new implementation""" into nyc-dev by Mohamad Ayyash · 9 years ago
  23. 73b64aa Revert "Revert "Update make_ext4fs_internal param-list to match new implementation"" by Mohamad Ayyash · 9 years ago
  24. 3374892 Revert "Update make_ext4fs_internal param-list to match new implementation" by Mohamad Ayyash · 9 years ago
  25. 527cc0b Revert "Update make_ext4fs_internal param-list to match new implementation" by Mohamad Ayyash · 9 years ago
  26. 8e9878f Update make_ext4fs_internal param-list to match new implementation by Mohamad Ayyash · 9 years ago
  27. 6d94dfe Update make_ext4fs_internal param-list to match new implementation by Mohamad Ayyash · 9 years ago
  28. 008ed76 Merge "fs_mgr: BLKGETSIZE causes memory corruption" am: 9c9818374e by Elliott Hughes · 9 years ago
  29. d93adf5 fs_mgr: BLKGETSIZE causes memory corruption by Keith Mok · 9 years ago
  30. c31f1f3 Check for breadcrumbs only where relevant by Paul Crowley · 9 years ago
  31. 6908018 Remove code to handle non-default file encryption by Paul Lawrence · 9 years ago
  32. dce48bc Merge "fs_mgr: support upstream dm-verity without error correction" am: 907ec7daa7 by Sami Tolvanen · 9 years ago
  33. 6401e61 Merge "Set up dm-verity in EIO mode instead of logging mode" am: 0d1214c68e by Sami Tolvanen · 9 years ago
  34. 907ec7d Merge "fs_mgr: support upstream dm-verity without error correction" by Sami Tolvanen · 9 years ago
  35. 0d1214c Merge "Set up dm-verity in EIO mode instead of logging mode" by Sami Tolvanen · 9 years ago
  36. ff980d2 fs_mgr: support upstream dm-verity without error correction by Sami Tolvanen · 9 years ago
  37. ef119a1 Merge "Track rename of base/ to android-base/." am: 912ed3d8ca am: e2a9563be1 by Elliott Hughes · 9 years ago
  38. 4f71319 Track rename of base/ to android-base/. by Elliott Hughes · 9 years ago
  39. 2cd762d HACK: Run e2fsck with -f by Daniel Rosenberg · 9 years ago
  40. 90f52df Set up dm-verity in EIO mode instead of logging mode by Sami Tolvanen · 9 years ago
  41. 8d63383 Encrypt on reboot by Paul Lawrence · 9 years ago
  42. aecb1e2 Respect breadcrumb to convert to file encryption by Paul Lawrence · 9 years ago
  43. b262d68 Add developer option to convert from FDE to FBE by Paul Lawrence · 9 years ago
  44. 25b230c fs_mgr: set partition.*.verified property even without state by Sami Tolvanen · 9 years ago
  45. 99e3a92 Error correction: Use libfec in fs_mgr by Sami Tolvanen · 10 years ago
  46. 0923453 Revert "Error correction: Use libfec in fs_mgr" by Sami Tolvanen · 9 years ago
  47. 3de3a0f Error correction: Use libfec in fs_mgr by Sami Tolvanen · 10 years ago
  48. 67b3cad Switch to android::base::ReadFully by Johan Redestig · 9 years ago
  49. 246c18c Switch fs_mgr_verity.c to C++. by Elliott Hughes · 9 years ago
  50. 049399e am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for invalid signatures" by Sami Tolvanen · 9 years ago
  51. 1ada149 fs_mgr: trigger dm-verity error handling for invalid signatures by Sami Tolvanen · 9 years ago
  52. 4ae302a fs_mgr: trigger dm-verity error handling for invalid signatures by Sami Tolvanen · 9 years ago
  53. 77557e9 am d906b297: Merge "fs_mgr: Error out if unable to determine slot_suffix" by David Zeuthen · 9 years ago
  54. d906b29 Merge "fs_mgr: Error out if unable to determine slot_suffix" by David Zeuthen · 9 years ago
  55. bd0231c fs_mgr: Error out if unable to determine slot_suffix by David Zeuthen · 9 years ago
  56. 80364b9 am 6ca11db7: Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect." by David Zeuthen · 9 years ago
  57. 744a8f8 fs_mgr: Fix ENOMEM behavior when dealing with slotselect. by David Zeuthen · 9 years ago
  58. 1c7060e resolved conflicts for d8eed7ff to stage-aosp-master by David Zeuthen · 9 years ago
  59. 227ef3c fs_mgr: Use slot_suffix field from bootloader_message. by David Zeuthen · 9 years ago
  60. eb65ce0 resolved conflicts for merge of 7c4ed6af to stage-aosp-master by Daniel Rosenberg · 9 years ago
  61. 7c4ed6a Merge "fs_mgr: Add support for A/B partitions" by Daniel Rosenberg · 9 years ago
  62. 8bb2f36 fs_mgr: Add support for A/B partitions by Daniel Rosenberg · 9 years ago
  63. 2ef82cf am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext" by Yusuke Sato · 9 years ago
  64. d81c3c6 Add |opts| argument to android_fork_execvp_ext by Yusuke Sato · 9 years ago
  65. 88f82b6 am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed." by Daniel Rosenberg · 9 years ago
  66. 31a4faf Skip mounting /, just mark block device as ro if needed. by Daniel Rosenberg · 9 years ago
  67. 7c842b5 am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot" by Yusuke Sato · 9 years ago
  68. 0e3ce82 Merge "Use fsck.f2fs -a instead of -f for faster boot" by Yusuke Sato · 9 years ago
  69. 5f2b3b4 am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set" by Sami Tolvanen · 9 years ago
  70. 83d8701 Update partition.*.verified even with ro.boot.veritymode set by Sami Tolvanen · 10 years ago
  71. 0df0827 Use fsck.f2fs -a instead of -f for faster boot by Yusuke Sato · 9 years ago
  72. 2f42554 Update partition.*.verified even with ro.boot.veritymode set by Sami Tolvanen · 10 years ago
  73. a0fbb90 am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev by Thierry Strudel · 9 years ago
  74. df33ffa fs_config: replace getenv('OUT') by new fs_config parameter by Thierry Strudel · 9 years ago
  75. 3fd58ae fs_mgr: Use ro.boot.veritymode by Sami Tolvanen · 10 years ago
  76. 182e561 am 450a24a5: am c604ccfa: Merge "Only pass nomblk_io_submit option when mounting ext4" by Elliott Hughes · 10 years ago
  77. c604ccf Merge "Only pass nomblk_io_submit option when mounting ext4" by Elliott Hughes · 10 years ago
  78. 62481cf am ecad7587: am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode" by Sami Tolvanen · 10 years ago
  79. ac5c122 fs_mgr: Use ro.boot.veritymode by Sami Tolvanen · 10 years ago
  80. 6ed84c9 Only pass nomblk_io_submit option when mounting ext4 by Oreste Salerno · 10 years ago
  81. 0a423d9 DO NOT MERGE Securely encrypt the master key by Paul Lawrence · 10 years ago
  82. af02e24 am 9fc83437: Don\'t use TEMP_FAILURE_RETRY on close in system/core. by Elliott Hughes · 10 years ago
  83. 9fc8343 Don't use TEMP_FAILURE_RETRY on close in system/core. by Elliott Hughes · 10 years ago
  84. 47b0134 Don't use TEMP_FAILURE_RETRY on close in system/core. by Elliott Hughes · 10 years ago
  85. 355bd1f am b33118ac: am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev by Iliyan Malchev · 10 years ago
  86. b33118a am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev by Iliyan Malchev · 10 years ago
  87. 2557cd2 am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev by Iliyan Malchev · 10 years ago
  88. 16092b7 Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev by Iliyan Malchev · 10 years ago
  89. 0b3a8a7 am 8b41a4a3: am 9680eaa1: Merge "fs_mgr: remove some dead code" by Elliott Hughes · 10 years ago
  90. 093dd31 fs_mgr: remove some dead code by Oleksiy Avramchenko · 10 years ago
  91. 3ea902f fs_mgr: allow for zramsize to be specified as percentage of total memory by Iliyan Malchev · 10 years ago
  92. b8fca94 Merge commit '2fe6a631' into manualmerge by Paul Lawrence · 10 years ago
  93. 806d10b Securely encrypt the master key by Paul Lawrence · 10 years ago
  94. 658801f resolved conflicts for merge of 6a5244bc to mnc-dev-plus-aosp by Paul Lawrence · 10 years ago
  95. 2b3a493 Merge "Revert "Securely encrypt the master key"" by Paul Lawrence · 10 years ago
  96. 7ac2807 Revert "Securely encrypt the master key" by Paul Lawrence · 10 years ago
  97. 7880f81 resolved conflicts for merge of 72fad66f to mnc-dev-plus-aosp by Paul Lawrence · 10 years ago
  98. 9234b16 Merge "Securely encrypt the master key" by Paul Lawrence · 10 years ago
  99. 4822bd1 am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures." by Elliott Hughes · 10 years ago
  100. 92f075a am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures." by Elliott Hughes · 10 years ago