Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 73a5b06578784f49ffb1ef766ebc29c4a9d297d0
commit73a5b06578784f49ffb1ef766ebc29c4a9d297d0[log] [tgz]
authorPaul Crowley <paulcrowley@google.com>Thu Jun 29 01:20:07 2017 +0000
committerandroid-build-merger <android-build-merger@google.com>Thu Jun 29 01:20:07 2017 +0000
tree1f7e34abc7ec9252aa3eeb79c985da62b12432be
parentf05f5040c4ba3c1fa2e67dfd99efdd4a37826183 [diff]
parent071120776a023a726dbdcb2ca6fa5293367f0281 [diff]
resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp
am: 071120776a

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