Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 75fc83bac8ad3aba3bbb65092974ab3a16822210
commit75fc83bac8ad3aba3bbb65092974ab3a16822210[log] [tgz]
authorJeff Vander Stoep <jeffv@google.com>Mon Feb 01 15:24:58 2016 -0800
committerJeff Vander Stoep <jeffv@google.com>Mon Feb 01 15:24:58 2016 -0800
tree2959d902d64b6557cbd8c25b67553a7ff6e25342
parentb92f83c0512bfb93e85d6cd8d6efd6681017664c [diff]
parent2b6f9ce823adf9be2045452f4337a22500567ffc [diff]
resolve merge conflicts of 2b6f9ce823 to master.

Change-Id: I69f36f560334b11b099f2eb15999603dd2469d4f
tree: 2959d902d64b6557cbd8c25b67553a7ff6e25342
  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. secdiscard.cpp
  50. secontext.cpp
  51. secontext.h
  52. sehandle.h
  53. TrimTask.cpp
  54. TrimTask.h
  55. Utils.cpp
  56. Utils.h
  57. vdc.cpp
  58. vdc.rc
  59. vold.rc
  60. VoldCommand.cpp
  61. VoldCommand.h
  62. VoldUtil.c
  63. VoldUtil.h
  64. VolumeBase.cpp
  65. VolumeBase.h
  66. VolumeManager.cpp
  67. VolumeManager.h