1. 06d3b6d Merge tag 'android-6.0.0_r26' into HEAD by David Ng · 9 years ago
  2. 23214af Modified the mounting sequence in case that MDTP is activated. by Amit Blay · 9 years ago
  3. 4ae302a fs_mgr: trigger dm-verity error handling for invalid signatures by Sami Tolvanen · 9 years ago
  4. 83d8701 Update partition.*.verified even with ro.boot.veritymode set by Sami Tolvanen · 9 years ago
  5. df33ffa fs_config: replace getenv('OUT') by new fs_config parameter by Thierry Strudel · 9 years ago
  6. 3fd58ae fs_mgr: Use ro.boot.veritymode by Sami Tolvanen · 9 years ago
  7. 0a423d9 DO NOT MERGE Securely encrypt the master key by Paul Lawrence · 9 years ago
  8. 9fc8343 Don't use TEMP_FAILURE_RETRY on close in system/core. by Elliott Hughes · 9 years ago
  9. 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 · 9 years ago
  10. 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 · 9 years ago
  11. 16092b7 Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev by Iliyan Malchev · 9 years ago
  12. 3ea902f fs_mgr: allow for zramsize to be specified as percentage of total memory by Iliyan Malchev · 9 years ago
  13. 4822bd1 am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures." by Elliott Hughes · 9 years ago
  14. 92f075a am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures." by Elliott Hughes · 9 years ago
  15. 5e7dd44 Improve bad error reporting seen in shamu SELinux boot failures. by Elliott Hughes · 9 years ago
  16. e498c7c resolved conflicts for merge of d0b6de41 to master by Ed Tam · 9 years ago
  17. 438443e resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp by Ed Tam · 9 years ago
  18. 79f3384 fs_mgr: introduce fs_mgr_format to format wiped partitions by Chris Fries · 11 years ago
  19. b09ef77 am d087e6f3: am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs""" by Mohamad Ayyash · 9 years ago
  20. 030ef35 Revert "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 9 years ago
  21. 56b8a6a am 0009bacf: am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 9 years ago
  22. 520431b am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 9 years ago
  23. e322ae1 Merge "Revert "fs_mgr_verity: Add support for squashfs"" by Mohamad Ayyash · 9 years ago
  24. 7b97c7a Revert "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 9 years ago
  25. 70f81ce Merge "fs_mgr_verity: Add support for squashfs" by Mohamad Ayyash · 9 years ago
  26. a90dd16 am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed" by Sami Tolvanen · 9 years ago
  27. 8560060 am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value" by Sami Tolvanen · 9 years ago
  28. 02f1d80 Merge "Restore verity state when verified partition is reflashed" by Sami Tolvanen · 9 years ago
  29. 284c5cb Merge "Set verity mode as the verified property value" by Sami Tolvanen · 9 years ago
  30. 807f470 fs_mgr_verity: Add support for squashfs by Mohamad Ayyash · 9 years ago
  31. b8bd76b Merge "Revert "Revert "Adding e4crypt support""" by Paul Lawrence · 9 years ago
  32. 487abaa am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr." by Dan Albert · 9 years ago
  33. c410b3b Revert "Revert "Adding e4crypt support"" by Paul Lawrence · 9 years ago
  34. bbbc634 Link libc++_static into fs_mgr. by Dan Albert · 9 years ago
  35. b8c9d27 Revert "Revert "Adding e4crypt support"" by Paul Lawrence · 9 years ago
  36. 6122edb Restore verity state when verified partition is reflashed by Sami Tolvanen · 9 years ago
  37. 4547423 Set verity mode as the verified property value by Sami Tolvanen · 9 years ago
  38. c1d6685 am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build" by Sami Tolvanen · 9 years ago
  39. b042a2e am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verity metadata" by Sami Tolvanen · 9 years ago
  40. 84b0bab Revert "Adding e4crypt support" by Paul Lawrence · 9 years ago
  41. 4d3ead9 Fix build by Sami Tolvanen · 9 years ago
  42. 946a0f3 Use structured format for verity metadata by Sami Tolvanen · 9 years ago
  43. 6095afc Adding e4crypt support by Paul Lawrence · 9 years ago
  44. ef09474 am 54bac178: am ddd0639e: Merge "Add init command to set verified properties" by Sami Tolvanen · 9 years ago
  45. acbf9be Add init command to set verified properties by Sami Tolvanen · 9 years ago
  46. bdd7cbd am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr" by Sami Tolvanen · 9 years ago
  47. 9fabbbf Merge "Do not call libcutils property_set in init through libfs_mgr" by Sami Tolvanen · 9 years ago
  48. fe6fcc4 fs_mgr: recognize a notrim mountpoint flag by JP Abgrall · 9 years ago
  49. 86cddf4 Do not call libcutils property_set in init through libfs_mgr by Sami Tolvanen · 9 years ago
  50. 8c2c089 am 291ce5b8: Merge "Fs_mgr: Fix format code" by Andreas Gampe · 9 years ago
  51. 6904e0c am a88fb24a: Merge "Add fs_mgr support for dm-verity modes" by Sami Tolvanen · 9 years ago
  52. eb69e85 Fs_mgr: Fix format code by Andreas Gampe · 9 years ago
  53. a88fb24 Merge "Add fs_mgr support for dm-verity modes" by Sami Tolvanen · 9 years ago
  54. 51bf11a Add fs_mgr support for dm-verity modes by Sami Tolvanen · 9 years ago
  55. 622d44d am fbb3f8ca: Merge "Set underlying block device RO when enabling verity" by Sami Tolvanen · 9 years ago
  56. 214f33b Set underlying block device RO when enabling verity by Sami Tolvanen · 9 years ago
  57. 0cc8da0 Merge commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31' into HEAD by Bill Yi · 9 years ago
  58. e2d63af Move sprintf to snprintf. by Yabin Cui · 9 years ago
  59. a173891 am 317b4024: Revert "Make encryption configurable" by Paul Lawrence · 9 years ago
  60. 846c8e0 am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic" by Nick Kralevich · 9 years ago
  61. 317b402 Revert "Make encryption configurable" by Paul Lawrence · 9 years ago
  62. 7294eb6 fs_mgr: error check umount calls / add retry logic by Nick Kralevich · 9 years ago
  63. 36d0eae Make encryption configurable by Paul Lawrence · 9 years ago
  64. 2f7ee6b Provide a way to select force encryption from vendor partition by Paul Lawrence · 9 years ago
  65. 7e890a4 am bda62724: Make encryption configurable by Paul Lawrence · 9 years ago
  66. 0944e30 am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab" by Elliott Hughes · 9 years ago
  67. 8298234 fs_mgr: Support filesystem labels in fstab by Christoffer Dall · 9 years ago
  68. 1fdd4dc am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab"" by Elliott Hughes · 9 years ago
  69. 253b9cf am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab" by JP Abgrall · 9 years ago
  70. 4083ed7 Merge "Revert "fs_mgr: Support filesystem labels in fstab"" by Elliott Hughes · 9 years ago
  71. 572226c Revert "fs_mgr: Support filesystem labels in fstab" by Elliott Hughes · 9 years ago
  72. f9e2339 Merge "fs_mgr: Support filesystem labels in fstab" by JP Abgrall · 9 years ago
  73. bda6272 Make encryption configurable by Paul Lawrence · 9 years ago
  74. 69407cc fs_mgr: Support filesystem labels in fstab by Christoffer Dall · 9 years ago
  75. 8e94075 am f2bd3fdd: Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev by Leo Wang · 9 years ago
  76. 703b87d Provide a way to select force encryption from vendor partition by Paul Lawrence · 9 years ago
  77. 9ccf0cb am a97c1075: Merge "Fix Nick\'s nits" by Elliott Hughes · 10 years ago
  78. 603c7d0 am 294e610f: Merge "Fix verity on system partitions larger than 2G" by Elliott Hughes · 10 years ago
  79. 88a12fb Fix Nick's nits by Paul Lawrence · 10 years ago
  80. 02c698d Fix verity on system partitions larger than 2G by Sami Tolvanen · 10 years ago
  81. 32e9163 resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp by Elliott Hughes · 10 years ago
  82. ec900bb Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"" by Paul Lawrence · 10 years ago
  83. 99184ba am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata by Sami Tolvanen · 10 years ago
  84. 2dfadac am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 by Sami Tolvanen · 10 years ago
  85. 72f0d92 DO NOT MERGE: Do not mount devices with invalid verity metadata by Sami Tolvanen · 10 years ago
  86. 9573a13 DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 by Sami Tolvanen · 10 years ago
  87. e90304c fs_mgr: let fsck.f2fs actually attempt a fix automerge: eb6036a by JP Abgrall · 10 years ago
  88. eb6036a fs_mgr: let fsck.f2fs actually attempt a fix by JP Abgrall · 10 years ago
  89. 7a59c85 am 4cafe2ff: Fix verity on system partitions larger than 2G by Sami Tolvanen · 10 years ago
  90. 4cafe2f Fix verity on system partitions larger than 2G by Sami Tolvanen · 10 years ago
  91. a1ab5a8 am 97e48731: Fix Nick\'s nits by Paul Lawrence · 10 years ago
  92. 6e9857d resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp by Paul Lawrence · 10 years ago
  93. c638c66 resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp by Paul Lawrence · 10 years ago
  94. cc496db resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp by Paul Lawrence · 10 years ago
  95. 97e4873 Fix Nick's nits by Paul Lawrence · 10 years ago
  96. bbb3631 Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"" by Paul Lawrence · 10 years ago
  97. 3e64bf4 am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage" by Mark Salyzyn · 10 years ago
  98. ee80cf8 am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage" by Mark Salyzyn · 10 years ago
  99. 152d2d4 Revert "Enable verity on userdebug, and add disable-verity to adb" by Nick Kralevich · 10 years ago
  100. 89fa114 fs_mgr: fix build breakage by Mark Salyzyn · 10 years ago