Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / ccd9dd53f8a55b296eb0671acefc9f0163fd83b4
commitccd9dd53f8a55b296eb0671acefc9f0163fd83b4[log] [tgz]
authorElliott Hughes <enh@google.com>Tue Apr 12 16:44:04 2016 -0700
committerElliott Hughes <enh@google.com>Tue Apr 12 16:44:04 2016 -0700
treec1157401175977c41efac868794fb8514e3dacd8
parent8afff3bfe18320cece8b5601478a34c313a5ad46 [diff]
parent81fd991d8bfbc66b43bf22919c87d8b8de6fb008 [diff]
resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp

Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
tree: c1157401175977c41efac868794fb8514e3dacd8
  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