1. 2d09c32 [automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 am: 2b9a343319 -s ours am: 8e7c2624bb by Jeff Sharkey · 7 years ago
  2. 82208b7 [automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 am: 2b9a343319 -s ours by Jeff Sharkey · 7 years ago
  3. 8e7c262 [automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 by Jeff Sharkey · 7 years ago
  4. 2b9a343 Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f by Jeff Sharkey · 7 years ago
  5. f707f1b Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 by Jeff Sharkey · 7 years ago
  6. 9a35ab6 Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 by Jeff Sharkey · 7 years ago
  7. 635193a [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a am: 4de0e883d0 am: a7946bf9c6 by Android Build Merger (Role) · 7 years ago
  8. a7946bf [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a am: 4de0e883d0 by Android Build Merger (Role) · 7 years ago
  9. 4de0e88 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a by Android Build Merger (Role) · 7 years ago
  10. 5716ee6 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad by Android Build Merger (Role) · 7 years ago
  11. 53fe89b [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 by Android Build Merger (Role) · 7 years ago
  12. 7e51f8d [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 by Android Build Merger (Role) · 7 years ago
  13. 0c5a0d6 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 by Android Build Merger (Role) · 7 years ago
  14. 98bb129 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 by Android Build Merger (Role) · 7 years ago
  15. ee5c731 Require quotes when searching for blkid keys. by Jeff Sharkey · 7 years ago
  16. ae235f5 Explain the rationale for not using StrongBox in vold. am: e763ed2aa3 by Shawn Willden · 7 years ago
  17. cb62773 Explain the rationale for not using StrongBox in vold. am: e763ed2aa3 by Shawn Willden · 7 years ago
  18. e763ed2 Explain the rationale for not using StrongBox in vold. by Shawn Willden · 7 years ago
  19. d517180 Add rc file for wait_for_keymaster am: f5b085c13a am: 694140bf71 by Wei Wang · 7 years ago
  20. 694140b Add rc file for wait_for_keymaster am: f5b085c13a by Wei Wang · 7 years ago
  21. f5b085c Add rc file for wait_for_keymaster by Wei Wang · 7 years ago
  22. a28944f Merge "vold: Add nvme disk support" am: 6054bc3ded am: 3a920e3f6e am: d6502365c7 by Dmitry Shmidt · 7 years ago
  23. d650236 Merge "vold: Add nvme disk support" am: 6054bc3ded am: 3a920e3f6e by Dmitry Shmidt · 7 years ago
  24. 3a920e3 Merge "vold: Add nvme disk support" am: 6054bc3ded by Dmitry Shmidt · 7 years ago
  25. 6054bc3 Merge "vold: Add nvme disk support" by Treehugger Robot · 7 years ago
  26. 06dc6e5 vold: Add nvme disk support by Dmitry Shmidt · 7 years ago
  27. 0c5a849 Merge "Do Keymaster HMAC key agreement in vold." into pi-dev am: a229dac0e7 by Shawn Willden · 7 years ago
  28. 9bc1204 Merge "Do Keymaster HMAC key agreement in vold." into pi-dev am: a229dac0e7 by Shawn Willden · 7 years ago
  29. a229dac Merge "Do Keymaster HMAC key agreement in vold." into pi-dev by TreeHugger Robot · 7 years ago
  30. 452ff61 Fix spurious error am: 98a23a19d1 am: ee4aa096d9 by Paul Crowley · 7 years ago
  31. ee4aa09 Fix spurious error am: 98a23a19d1 by Paul Crowley · 7 years ago
  32. 98a23a1 Fix spurious error by Paul Crowley · 7 years ago
  33. 8d895e2 add wait_for_keymaster am: 8f82879901 am: 07b28ebecd by Paul Crowley · 7 years ago
  34. 07b28eb add wait_for_keymaster am: 8f82879901 by Paul Crowley · 7 years ago
  35. 2807536 Do Keymaster HMAC key agreement in vold. by Shawn Willden · 7 years ago
  36. 8f82879 add wait_for_keymaster by Paul Crowley · 7 years ago
  37. 5e563f7 [automerger skipped] Merge changes I3c14cfcf,I9d2ea66c,I9930105e am: 14540d9ceb am: b053bc0716 -s ours by Logan Chien · 7 years ago
  38. ba2861c [automerger skipped] Merge changes I3c14cfcf,I9d2ea66c,I9930105e am: 14540d9ceb by Logan Chien · 7 years ago
  39. b053bc0 Merge changes I3c14cfcf,I9d2ea66c,I9930105e am: 14540d9ceb by Logan Chien · 7 years ago
  40. 14540d9 Merge changes I3c14cfcf,I9d2ea66c,I9930105e by Logan Chien · 7 years ago
  41. f020307 Deprecate <cutils/log.h> and <utils/Log.h> am: 188b0ab7b3 by Logan Chien · 7 years ago
  42. befcd8f Replace library headers with angle quotations am: 3f2b122cd2 by Logan Chien · 7 years ago
  43. c9db561 Reorder the include directives in cryptfs.cpp am: d557d76466 by Logan Chien · 7 years ago
  44. 50edc95 Add linux/types.h to cryptfs.h am: 0267ccf8a4 by Logan Chien · 7 years ago
  45. 196d585 Replace library headers with angle quotations by Logan Chien · 7 years ago
  46. 862eef7 Reorder the include directives in cryptfs.cpp by Logan Chien · 7 years ago
  47. 83a5ad2 Add linux/types.h to cryptfs.h by Logan Chien · 7 years ago
  48. 188b0ab Deprecate <cutils/log.h> and <utils/Log.h> by Logan Chien · 7 years ago
  49. 3f2b122 Replace library headers with angle quotations by Logan Chien · 7 years ago
  50. d557d76 Reorder the include directives in cryptfs.cpp by Logan Chien · 7 years ago
  51. 0267ccf Add linux/types.h to cryptfs.h by Logan Chien · 7 years ago
  52. a409358 Merge "vold: Idle-maint calls device GC" into pi-dev am: 4a04cad4ec by Jaegeuk Kim · 7 years ago
  53. 53411c7 Merge "vold: Idle-maint calls device GC" into pi-dev am: 4a04cad4ec by Jaegeuk Kim · 7 years ago
  54. 4a04cad Merge "vold: Idle-maint calls device GC" into pi-dev by TreeHugger Robot · 7 years ago
  55. 26c61e9 Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev am: b244714eea by Tri Vo · 7 years ago
  56. 8337899 Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev am: b244714eea by Tri Vo · 7 years ago
  57. b244714 Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev by TreeHugger Robot · 7 years ago
  58. bca5cd7 Exclude /mnt/vendor from vold's ownership. by Tri Vo · 7 years ago
  59. eefc5ee vold: Idle-maint calls device GC by Jaegeuk Kim · 7 years ago
  60. 0c2ca40 vold: set f2fs feature bit am: 7db02ab5d1 am: 4e3a51ff18 by Jaegeuk Kim · 7 years ago
  61. 4e3a51f vold: set f2fs feature bit am: 7db02ab5d1 by Jaegeuk Kim · 7 years ago
  62. 7db02ab vold: set f2fs feature bit by Jaegeuk Kim · 7 years ago
  63. 61339de Merge "Remove waitpid on UnMount" am: f6dbba8846 am: 1584dc0d1d am: eea3792845 by Daniel Rosenberg · 7 years ago
  64. eea3792 Merge "Remove waitpid on UnMount" am: f6dbba8846 am: 1584dc0d1d by Daniel Rosenberg · 7 years ago
  65. 1584dc0 Merge "Remove waitpid on UnMount" am: f6dbba8846 by Daniel Rosenberg · 7 years ago
  66. f6dbba8 Merge "Remove waitpid on UnMount" by Treehugger Robot · 7 years ago
  67. bd411fa Disable use of StrongBox for encryption am: c1903ad3d6 am: 27e7cc4e79 by Shawn Willden · 7 years ago
  68. 27e7cc4 Disable use of StrongBox for encryption am: c1903ad3d6 by Shawn Willden · 7 years ago
  69. c1903ad Disable use of StrongBox for encryption by Shawn Willden · 7 years ago
  70. f6bd834 Gate use of allow_encrypt_override behind ro.crypto property am: 385cb8c4d6 by Paul Crowley · 7 years ago
  71. 7d1e0f3 Gate use of allow_encrypt_override behind ro.crypto property am: 385cb8c4d6 by Paul Crowley · 7 years ago
  72. 385cb8c Gate use of allow_encrypt_override behind ro.crypto property by Paul Crowley · 7 years ago
  73. 8b9a5b3 Remove waitpid on UnMount by Daniel Rosenberg · 7 years ago
  74. 3572d43 Remove secdiscard IPC call am: eb850f93ab am: ea0514ee95 by Rubin Xu · 7 years ago
  75. ea0514e Remove secdiscard IPC call am: eb850f93ab by Rubin Xu · 7 years ago
  76. eb850f9 Remove secdiscard IPC call by Rubin Xu · 7 years ago
  77. de787a8 Remove libarcmounter dependency in Vold by Risan · 7 years ago
  78. e283f99 Merge "Use unique_ptr<DIR> to safely release resources." by TreeHugger Robot · 7 years ago
  79. e50314d Trim whitespace from sysfs values. by Jeff Sharkey · 7 years ago
  80. 5540b44 Use unique_ptr<DIR> to safely release resources. by Jeff Sharkey · 7 years ago
  81. 8c26c46 Merge "Add ArcService AIDL in Vold" by TreeHugger Robot · 7 years ago
  82. ea2d2bb Add ArcService AIDL in Vold by Risan · 7 years ago
  83. af70567 Merge "vold: Idle-maint issues discards fully" by Jaegeuk Kim · 7 years ago
  84. a6aae2f vold: Idle-maint issues discards fully by Jaegeuk Kim · 7 years ago
  85. 38723f2 cryptfs: Optionally get crypto type as a property by Greg Kaiser · 7 years ago
  86. 57f9af6 cryptfs: Require ext disk crypt to match code by Greg Kaiser · 7 years ago
  87. 59ad018 cryptfs: Use the crypt_mnt_ftr keysize by Greg Kaiser · 7 years ago
  88. 1751025 Merge "mFusePid should be cleared after waitpid successfully" am: 456483d193 am: 8be3be3167 by Gao Xiang · 7 years ago
  89. 8fe7f31 Merge "mFusePid should be cleared after waitpid successfully" am: 456483d193 by Gao Xiang · 7 years ago
  90. 8be3be3 Merge "mFusePid should be cleared after waitpid successfully" am: 456483d193 by Gao Xiang · 7 years ago
  91. 456483d Merge "mFusePid should be cleared after waitpid successfully" by Treehugger Robot · 7 years ago
  92. 00eda38 cryptfs: Don't use bare integers for key size by Greg Kaiser · 7 years ago
  93. c0de9c7 cryptfs: Clarify sizing of intermediate key by Greg Kaiser · 7 years ago
  94. b802078 Revert "cryptfs: Don't hardcode ikey buffer size" by Greg Kaiser · 7 years ago
  95. 2c92d7b Revert "cryptfs: Make decrypted key buffers large enough" by Greg Kaiser · 7 years ago
  96. fa09961 Revert "cryptfs: Optionally get crypt type from properties" by Greg Kaiser · 7 years ago
  97. 291fec1 cryptfs: Optionally get crypt type from properties by Greg Kaiser · 7 years ago
  98. 4a35ef0 cryptfs: Make decrypted key buffers large enough by Greg Kaiser · 7 years ago
  99. 1452b27 cryptfs: Don't hardcode ascii buffer size by Greg Kaiser · 7 years ago
  100. f45a70c cryptfs: Don't hardcode ikey buffer size by Greg Kaiser · 7 years ago