1. 3c73fda Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  2. 1cbe0ce merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  3. 92736ef Another fix for encryption by Ken Sumrall · 12 years ago
  4. f1a6123 Fix encryption on certain devices by Ken Sumrall · 12 years ago
  5. 9dedfd4 Fix encryption on certain devices by Ken Sumrall · 12 years ago
  6. 2a012c0 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  7. 7a3c3d4 Unmount in-place instead of using MS_MOVE. by Jeff Sharkey · 12 years ago
  8. 13f393d Update environment variable for multi-user. by Jeff Sharkey · 12 years ago
  9. b77bc46 Update environment variable for multi-user. by Jeff Sharkey · 12 years ago
  10. 9f910d8 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  11. e919efe Workaround a kernel race when loading dmcrypt table by Ken Sumrall · 12 years ago
  12. 2bbf02c merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 12 years ago
  13. 6947904 Handle multi-user mountObb() requests. by Jeff Sharkey · 12 years ago
  14. e270d6c Unmount external storage on multi-user devices. by Jeff Sharkey · 12 years ago
  15. 7382f81 Unmount external storage on multi-user devices. by Jeff Sharkey · 12 years ago
  16. f763b2f am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge by The Android Open Source Project · 12 years ago
  17. 7c5109b Reconcile with jb-mr0-release - do not merge by The Android Open Source Project · 12 years ago
  18. a20b197 merge in jb-mr0-release history after reset to jb-dev by The Android Automerger · 12 years ago
  19. 4fe053e am 62224a32: (-s ours) am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE by Kenny Root · 12 years ago
  20. 62224a3 am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGE by Kenny Root · 12 years ago
  21. eacf7e0 Only cleanup ASECs in external storage DO NOT MERGE by Kenny Root · 12 years ago
  22. 93ecb38 Only cleanup ASECs in external storage by Kenny Root · 12 years ago
  23. 912d0b0 Merge "Fix a typo in cryptfs.c" by Ken Sumrall · 13 years ago
  24. 319369a Fix a typo in cryptfs.c by Ken Sumrall · 13 years ago
  25. 4684e58 Add mode when open(O_CREAT) is used. by Nick Kralevich · 13 years ago
  26. b405f36 am 9ee8a315: Reconcile with jb-release by The Android Open Source Project · 13 years ago
  27. 9ee8a31 Reconcile with jb-release by The Android Open Source Project · 13 years ago
  28. 51d1ae1 am a7926050: am 425524db: Unmount all asec apps before encrypting by Ken Sumrall · 13 years ago
  29. a792605 am 425524db: Unmount all asec apps before encrypting by Ken Sumrall · 13 years ago
  30. 4053aae Unmount all asec apps before encrypting by Ken Sumrall · 13 years ago
  31. 425524d Unmount all asec apps before encrypting by Ken Sumrall · 13 years ago
  32. fc676b6 am e925ff66: am bac5eb96: Merge "Delay disk inserted broadcast until disk is ready" by Jean-Baptiste Queru · 13 years ago
  33. e925ff6 am bac5eb96: Merge "Delay disk inserted broadcast until disk is ready" by Jean-Baptiste Queru · 13 years ago
  34. bac5eb9 Merge "Delay disk inserted broadcast until disk is ready" by Jean-Baptiste Queru · 13 years ago
  35. ac3d1ea am 2fdea0aa: Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 13 years ago
  36. 2fdea0a Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 13 years ago
  37. bfc7db4 merge in jb-release history after reset to jb-dev by The Android Automerger · 13 years ago
  38. b1dd92c am 760cec44: am 41836711: Merge "Sleep to wait for dm to create node" into jb-dev by Kenny Root · 13 years ago
  39. 760cec4 am 41836711: Merge "Sleep to wait for dm to create node" into jb-dev by Kenny Root · 13 years ago
  40. 4183671 Merge "Sleep to wait for dm to create node" into jb-dev by Kenny Root · 13 years ago
  41. 4817b30 Native library loading needs to read directory by Kenny Root · 13 years ago
  42. 59f31de Only set permissions on dirs or files by Kenny Root · 13 years ago
  43. cdc2a1c Sleep to wait for dm to create node by Kenny Root · 13 years ago
  44. e80077f am 9688165c: am 1a673c86: Native library loading needs to read directory by Kenny Root · 13 years ago
  45. 9688165 am 1a673c86: Native library loading needs to read directory by Kenny Root · 13 years ago
  46. dc452c3 am 457197c5: am 348c8aba: Only set permissions on dirs or files by Kenny Root · 13 years ago
  47. 1a673c8 Native library loading needs to read directory by Kenny Root · 13 years ago
  48. 457197c am 348c8aba: Only set permissions on dirs or files by Kenny Root · 13 years ago
  49. 348c8ab Only set permissions on dirs or files by Kenny Root · 13 years ago
  50. 7bffd44 am 0e110bb5: am 5cf6325c: Merge "Unshare ums when SD card is removed" by Jean-Baptiste Queru · 13 years ago
  51. 0e110bb am 5cf6325c: Merge "Unshare ums when SD card is removed" by Jean-Baptiste Queru · 13 years ago
  52. 5cf6325 Merge "Unshare ums when SD card is removed" by Jean-Baptiste Queru · 13 years ago
  53. 3dafc26 Delay disk inserted broadcast until disk is ready by Magnus Malmborn · 14 years ago
  54. 6273661 Unshare ums when SD card is removed by Lars Svensson · 14 years ago
  55. e943539 merge in jb-release history after reset to jb-dev by The Android Automerger · 13 years ago
  56. af05ec0 am e5032c42: Changes to encryption to work with the new filesystem manager by Ken Sumrall · 13 years ago
  57. e5032c4 Changes to encryption to work with the new filesystem manager by Ken Sumrall · 13 years ago
  58. f0679f0 Changes to encryption to work with the new filesystem manager by Ken Sumrall · 13 years ago
  59. 5dcf48a Fix truncation of ASEC ids by Kenny Root · 13 years ago
  60. 7b0bc85 Fix truncation of ASEC ids by Kenny Root · 13 years ago
  61. 344ca10 Add in ext4 support for ASEC containers by Kenny Root · 13 years ago
  62. 8cd47b4 Merge remote-tracking branch 'goog/ics-aah-exp' by Mike Lockwood · 13 years ago
  63. 781bbab Merge commit '43b80c229bdee7f32654e2ec561078c5c94c8851' by Mike Lockwood · 13 years ago
  64. b018fe7 Merge "Fix vdc to add sequence number for NativeConectorDaemon" by Ken Sumrall · 13 years ago
  65. d02a472 Merge "Fix to not return a bogus decryption error when a device is not encrypted." by Ken Sumrall · 13 years ago
  66. d4b3661 Fix vdc to add sequence number for NativeConectorDaemon by Ken Sumrall · 13 years ago
  67. c7ad326 Merge "Use sched_policy to avoid hard-coded cpuctl path" by Glenn Kasten · 13 years ago
  68. 1b4807b Use sched_policy to avoid hard-coded cpuctl path by Glenn Kasten · 13 years ago
  69. 149aa3e Use the new command numbering scheme. by Robert Greenwalt · 13 years ago
  70. 9713ed4 vold: add -Werror=format by Nick Kralevich · 13 years ago
  71. ee6d8c4 Add support for wiping data immediately if crypt fails by Mike Lockwood · 13 years ago
  72. a6251c6 Add support for wiping data immediately if crypt fails by Mike Lockwood · 13 years ago
  73. e1a4585 Fix to not return a bogus decryption error when a device is not encrypted. by Ken Sumrall · 13 years ago
  74. 43b80c2 keep previous history after reset to mr1 plus aah changes (ics-aah-wip) by Ed Heyl · 13 years ago
  75. fab5f87 undo reset to ics-mr1 until we have a better method by Ed Heyl · 13 years ago
  76. e029169 reset to ics-mr1, but keep history by Ed Heyl · 13 years ago
  77. 71189e7 am 8c487331: (-s ours) Rename LOG() to ALOG() DO NOT MERGE by Steve Block · 13 years ago
  78. 8c48733 Rename LOG() to ALOG() DO NOT MERGE by Steve Block · 13 years ago
  79. 3ad9072 Add the new verifypw command to vold/cryptfs by Ken Sumrall · 13 years ago
  80. 3be890f Fix cryptfs to work with a raw block device for key storage by Ken Sumrall · 13 years ago
  81. 0b8b597 Add the ability to revert a crypto mapping when unmounting a volume by Ken Sumrall · 13 years ago
  82. e14fcf9 Reconcile with gingerbread-release by The Android Open Source Project · 13 years ago
  83. 5bf00e6 am 6c190fd3: am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  84. 6c190fd am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  85. 137858b resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  86. 8189325 Merge "Remove the simulator target from all makefiles. Bug: 5010576" by Jeff Brown · 13 years ago
  87. ea89f53 Remove the simulator target from all makefiles. Bug: 5010576 by Jeff Brown · 13 years ago
  88. 6f0b430 Merge "Prevent sharing or formatting of a vold managed volumes during encryption." by Ken Sumrall · 13 years ago
  89. 3b17005 Prevent sharing or formatting of a vold managed volumes during encryption. by Ken Sumrall · 13 years ago
  90. 396844d Merge "Fix to display the proper percentage complete during encryption." by Ken Sumrall · 13 years ago
  91. 128626f Fix to display the proper percentage complete during encryption. by Ken Sumrall · 14 years ago
  92. a0272d2 reset, and keep history by android-merger · 13 years ago
  93. 5284bcf merge intel x86 patches into gingerbread branch by David 'Digit' Turner · 13 years ago
  94. 5283052 Reconcile with gingerbread-release by The Android Open Source Project · 13 years ago
  95. 1c55ddb Revert "add bounds checking for mPartMinors[]" by android-merger · 13 years ago
  96. cf7369a Revert "vold: Enable the SO_PASSCRED socket option" by android-merger · 13 years ago
  97. 507d31b vold: retry mounting partition by Joseph Lehrer · 14 years ago
  98. 9322b10 am 273d3549: am 2c9d8de7: Merge "Prevent buffer overflows." by Mike Lockwood · 14 years ago
  99. 273d354 am 2c9d8de7: Merge "Prevent buffer overflows." by Mike Lockwood · 14 years ago
  100. 2c9d8de Merge "Prevent buffer overflows." by Mike Lockwood · 14 years ago