1. ddf384d merge in master-release history after reset to 8c008397141bf9a7d619eb2c53452bf3e397da39 by The Android Automerger · 11 years ago
  2. d804160 merge in master-release history after reset to 8c008397141bf9a7d619eb2c53452bf3e397da39 by The Android Automerger · 11 years ago
  3. a62481c merge in master-release history after reset to 8c008397141bf9a7d619eb2c53452bf3e397da39 by The Android Automerger · 11 years ago
  4. a801450 Fix encryption on Nakasi by Paul Lawrence · 11 years ago
  5. 8c00839 Fix encryption on Nakasi by Paul Lawrence · 11 years ago
  6. 8ee0410 am 2d3c0c05: am a821d50b: am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>"" by JP Abgrall · 11 years ago
  7. 2c4963a am a7a612bf: am 15c3e01e: am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." by Nick Kralevich · 11 years ago
  8. 86abdc4 am 598fdf7a: am 3d9b98cc: am 1dc1fb4a: Merge "vold: suppress unused argument warning messages" by Mark Salyzyn · 11 years ago
  9. 9066592 am e8a19bdb: am 9aace96c: am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers." by Nick Kralevich · 11 years ago
  10. 8e0f2a5 am 02cb9f5e: am 4c20805a: am 1d8e3ce8: Merge "vold: fix errors inside ALOGV" by Colin Cross · 11 years ago
  11. 2d3c0c0 am a821d50b: am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>"" by JP Abgrall · 11 years ago
  12. a7a612b am 15c3e01e: am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." by Nick Kralevich · 11 years ago
  13. 598fdf7 am 3d9b98cc: am 1dc1fb4a: Merge "vold: suppress unused argument warning messages" by Mark Salyzyn · 11 years ago
  14. e8a19bd am 9aace96c: am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers." by Nick Kralevich · 11 years ago
  15. 02cb9f5 am 4c20805a: am 1d8e3ce8: Merge "vold: fix errors inside ALOGV" by Colin Cross · 11 years ago
  16. bf85d89 Merge "Add keymaster support to cryptfs" by Paul Lawrence · 11 years ago
  17. 69f4ebd Add keymaster support to cryptfs by Paul Lawrence · 11 years ago
  18. e8feb83 Merge "vdc: fix segfault" by Mohamad Ayyash · 11 years ago
  19. 5e900ac vdc: fix segfault by Mohamad Ayyash · 11 years ago
  20. 45f1053 Revert "Revert "Encrypt phone even if pattern or no keyguard"" by Paul Lawrence · 11 years ago
  21. efec3f2 Revert "Encrypt phone even if pattern or no keyguard" by Paul Lawrence · 11 years ago
  22. 5cc86c5 Encrypt phone even if pattern or no keyguard by Paul Lawrence · 11 years ago
  23. 0798707 Merge "Fix setfield/getfield" by Paul Lawrence · 11 years ago
  24. cc21538 Merge "Store password in vold" by Paul Lawrence · 11 years ago
  25. 8799917 Don't corrupt ssd when encrypting and power fails by Paul Lawrence · 11 years ago
  26. 399317e Store password in vold by Paul Lawrence · 11 years ago
  27. 8561b5c Fix setfield/getfield by Paul Lawrence · 11 years ago
  28. a821d50 am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>"" by JP Abgrall · 11 years ago
  29. f8e9569 Merge "vold: Add a new mountall command." by Mohamad Ayyash · 11 years ago
  30. df7382e am a29997ae: am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>"" by JP Abgrall · 11 years ago
  31. 7929aa7 vold: Add a new mountall command. by Mohamad Ayyash · 11 years ago
  32. a29997a am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>"" by JP Abgrall · 11 years ago
  33. 470f0b3 Merge "Avoid segv by checking argc in "storage user <mountpoint>"" by JP Abgrall · 11 years ago
  34. edf7adf Avoid segv by checking argc in "storage user <mountpoint>" by JP Abgrall · 11 years ago
  35. 15c3e01 am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." by Nick Kralevich · 11 years ago
  36. 3d9b98c am 1dc1fb4a: Merge "vold: suppress unused argument warning messages" by Mark Salyzyn · 11 years ago
  37. 9aace96 am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers." by Nick Kralevich · 11 years ago
  38. 4c20805 am 1d8e3ce8: Merge "vold: fix errors inside ALOGV" by Colin Cross · 11 years ago
  39. 1d87676 am 706efb22: resolved conflicts for merge of 83755972 to klp-modular-dev-plus-aosp by Nick Kralevich · 11 years ago
  40. 706efb2 resolved conflicts for merge of 83755972 to klp-modular-dev-plus-aosp by Nick Kralevich · 11 years ago
  41. 8375597 Add SELinux restorecon calls on ASEC containers. by Robert Craig · 11 years ago
  42. 684dbdf Infrastructure to securely allow only one prompt at boot when encrypted by Paul Lawrence · 11 years ago
  43. 1348603 Enable auto-encrypt drive at startup by Paul Lawrence · 11 years ago
  44. 931f15d Merge "Support default, pattern, pin and password encryption types" by Paul Lawrence · 11 years ago
  45. 5773f9e am 3214d1f5: am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." by Nick Kralevich · 11 years ago
  46. 2c1bbe0 am 49dd24c2: am 1dc1fb4a: Merge "vold: suppress unused argument warning messages" by Mark Salyzyn · 11 years ago
  47. 3214d1f am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." by Nick Kralevich · 11 years ago
  48. 49dd24c am 1dc1fb4a: Merge "vold: suppress unused argument warning messages" by Mark Salyzyn · 11 years ago
  49. 3c0d02a Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." by Nick Kralevich · 11 years ago
  50. 1dc1fb4 Merge "vold: suppress unused argument warning messages" by Mark Salyzyn · 11 years ago
  51. f4faa57 Support default, pattern, pin and password encryption types by Paul Lawrence · 11 years ago
  52. 5eecc44 vold: suppress unused argument warning messages by Mark Salyzyn · 11 years ago
  53. 3e97127 vold: suppress unused argument warning messages by Mark Salyzyn · 11 years ago
  54. 5093e61 Convert all selinux_android_restorecon and _setfilecon calls to new API. by Stephen Smalley · 11 years ago
  55. 4ff7225 am ca3593df: am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers." by Nick Kralevich · 11 years ago
  56. ca3593d am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers." by Nick Kralevich · 11 years ago
  57. 311edc8 Merge "Add SELinux restorecon calls on ASEC containers." by Nick Kralevich · 11 years ago
  58. 88948cd am e985c9ab: am 1d8e3ce8: Merge "vold: fix errors inside ALOGV" by Colin Cross · 11 years ago
  59. e985c9a am 1d8e3ce8: Merge "vold: fix errors inside ALOGV" by Colin Cross · 11 years ago
  60. 1d8e3ce Merge "vold: fix errors inside ALOGV" by Colin Cross · 11 years ago
  61. 59846b6 vold: fix errors inside ALOGV by Colin Cross · 11 years ago
  62. b9e3ba5 Add SELinux restorecon calls on ASEC containers. by Robert Craig · 11 years ago
  63. c938df2 Merge "Fast ext4 encryption" by Paul Lawrence · 11 years ago
  64. ae59fe6 Fast ext4 encryption by Paul Lawrence · 11 years ago
  65. ba3b0e8 am e8e1d80c: am 4d5d99ce: am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  66. e8e1d80 am 4d5d99ce: am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  67. 4d5d99c am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  68. 7cf05b1 am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  69. 2f0a1d6 am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  70. 7f6932d am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  71. 35ab611 am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  72. 3e03bf8 am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  73. fd2dcf9 am f4770dcf: am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  74. f4770dc am 0de7c611: Validate asec names. by Nick Kralevich · 11 years ago
  75. 0de7c61 Validate asec names. by Nick Kralevich · 11 years ago
  76. 6696260 Validate asec names. by Nick Kralevich · 11 years ago
  77. 0101234 am 353b45f8: Merge "vold: fix warnings for 64-bit" by Colin Cross · 11 years ago
  78. 353b45f Merge "vold: fix warnings for 64-bit" by Colin Cross · 11 years ago
  79. 346c5b2 vold: fix warnings for 64-bit by Colin Cross · 11 years ago
  80. 699bfa4 am 8328e815: Merge "vold: remove from include path" by Colin Cross · 11 years ago
  81. 8328e81 Merge "vold: remove $(KERNEL_HEADERS) from include path" by Colin Cross · 11 years ago
  82. 23b571b vold: remove $(KERNEL_HEADERS) from include path by Colin Cross · 11 years ago
  83. 6fd5771 allow encrypted filesystems to be mounted readonly by Doug Zongker · 11 years ago
  84. dbf5b66 am 46f8c2b9: am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key. by JP Abgrall · 11 years ago
  85. 46f8c2b am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key. by JP Abgrall · 11 years ago
  86. 7bdfa52 vold: cryptfs: Don't update KDF without validating pwd/key. by JP Abgrall · 11 years ago
  87. 74a8ca7 am 86697c72: am 6bcd362e: Handle missing UUID/LABEL from blkid. by Jeff Sharkey · 11 years ago
  88. 86697c7 am 6bcd362e: Handle missing UUID/LABEL from blkid. by Jeff Sharkey · 11 years ago
  89. 6bcd362 Handle missing UUID/LABEL from blkid. by Jeff Sharkey · 11 years ago
  90. 502dc74 vold: cryptfs: Retry encryption after killing processes using /data by JP Abgrall · 11 years ago
  91. 0291262 am 3aefb598: am cc21d6ea: Use correct minor device number to format SD card by Blair Prescott · 11 years ago
  92. 3aefb59 am cc21d6ea: Use correct minor device number to format SD card by Blair Prescott · 11 years ago
  93. cc21d6e Use correct minor device number to format SD card by Blair Prescott · 11 years ago
  94. 18caf5b am 32e20905: am bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev by Jeff Sharkey · 11 years ago
  95. 0368cd4 am f4a8c0b9: am 10939ac7: Merge "Extract UUID and label from inserted volumes." into klp-dev by Jeff Sharkey · 11 years ago
  96. 32e2090 am bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev by Jeff Sharkey · 11 years ago
  97. f4a8c0b am 10939ac7: Merge "Extract UUID and label from inserted volumes." into klp-dev by Jeff Sharkey · 11 years ago
  98. bcdbd9a Merge "Clean up ASEC unmounting on physical storage." into klp-dev by Jeff Sharkey · 11 years ago
  99. 10939ac Merge "Extract UUID and label from inserted volumes." into klp-dev by Jeff Sharkey · 11 years ago
  100. 8c2c15b Clean up ASEC unmounting on physical storage. by Jeff Sharkey · 11 years ago