Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 030d7007ade0abd74a9d6fc0ff079ccf35066630
commit030d7007ade0abd74a9d6fc0ff079ccf35066630[log] [tgz]
authorJeff Sharkey <jsharkey@android.com>Wed Jul 06 16:26:43 2016 -0600
committerJeff Sharkey <jsharkey@android.com>Wed Jul 06 16:26:43 2016 -0600
tree0205817a3a0880b255b45646e666d3b784134504
parent5138d79e89e1678d411e2a5b9a5e445aaf04fb3a [diff]
parentd254ce4ed17ec25e8e879d1026b704c72678e307 [diff]
resolve merge conflicts of d254ce4 to master

Change-Id: Ia8dff82cb7648b568006d10bc99e2dd40a2d6e8e
tree: 0205817a3a0880b255b45646e666d3b784134504
  1. bench/
  2. fs/
  3. tests/
  4. Android.mk
  5. Asec.h
  6. AutoCloseFD.h
  7. Benchmark.cpp
  8. Benchmark.h
  9. BenchmarkGen.h
  10. CheckBattery.cpp
  11. CheckBattery.h
  12. CleanSpec.mk
  13. CommandListener.cpp
  14. CommandListener.h
  15. CryptCommandListener.cpp
  16. CryptCommandListener.h
  17. cryptfs.c
  18. cryptfs.h
  19. Devmapper.cpp
  20. Devmapper.h
  21. Disk.cpp
  22. Disk.h
  23. EmulatedVolume.cpp
  24. EmulatedVolume.h
  25. Ext4Crypt.cpp
  26. Ext4Crypt.h
  27. hash.h
  28. Keymaster.cpp
  29. Keymaster.h
  30. KeyStorage.cpp
  31. KeyStorage.h
  32. Loop.cpp
  33. Loop.h
  34. main.cpp
  35. MoveTask.cpp
  36. MoveTask.h
  37. NetlinkHandler.cpp
  38. NetlinkHandler.h
  39. NetlinkManager.cpp
  40. NetlinkManager.h
  41. PrivateVolume.cpp
  42. PrivateVolume.h
  43. Process.cpp
  44. Process.h
  45. PublicVolume.cpp
  46. PublicVolume.h
  47. ResponseCode.cpp
  48. ResponseCode.h
  49. ScryptParameters.cpp
  50. ScryptParameters.h
  51. secdiscard.cpp
  52. secontext.cpp
  53. secontext.h
  54. sehandle.h
  55. TrimTask.cpp
  56. TrimTask.h
  57. Utils.cpp
  58. Utils.h
  59. vdc.cpp
  60. vdc.rc
  61. vold.rc
  62. VoldCommand.cpp
  63. VoldCommand.h
  64. VoldUtil.c
  65. VoldUtil.h
  66. VolumeBase.cpp
  67. VolumeBase.h
  68. VolumeManager.cpp
  69. VolumeManager.h