Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 84ceaedb59400490a037604d7f30b5b94938afc6
commit84ceaedb59400490a037604d7f30b5b94938afc6[log] [tgz]
authorDaniel Rosenberg <drosen@google.com>Thu Mar 07 18:43:46 2019 -0800
committerandroid-build-merger <android-build-merger@google.com>Thu Mar 07 18:43:46 2019 -0800
tree186172c764329f19a36652e8f937ea825cb04466
parent73cfd4918b475415d825ebfe644698d3cdc4f7c9 [diff]
parent5f01cf3cac789275e205b1ac533f9b386501f322 [diff]
Merge changes I91cf0def,I47570e8e
am: 5f01cf3cac

Change-Id: If269c0d3134dc98683982a96224885503b2f8434
tree: 186172c764329f19a36652e8f937ea825cb04466
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format
  7. Android.bp
  8. AppFuseUtil.cpp
  9. AppFuseUtil.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. CheckEncryption.cpp
  14. CheckEncryption.h
  15. Checkpoint.cpp
  16. Checkpoint.h
  17. CleanSpec.mk
  18. cryptfs.cpp
  19. cryptfs.h
  20. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. IdleMaint.cpp
  29. IdleMaint.h
  30. KeyBuffer.cpp
  31. KeyBuffer.h
  32. Keymaster.cpp
  33. Keymaster.h
  34. KeyStorage.cpp
  35. KeyStorage.h
  36. KeyUtil.cpp
  37. KeyUtil.h
  38. Loop.cpp
  39. Loop.h
  40. main.cpp
  41. MetadataCrypt.cpp
  42. MetadataCrypt.h
  43. MoveStorage.cpp
  44. MoveStorage.h
  45. NetlinkHandler.cpp
  46. NetlinkHandler.h
  47. NetlinkManager.cpp
  48. NetlinkManager.h
  49. OWNERS
  50. PREUPLOAD.cfg
  51. Process.cpp
  52. Process.h
  53. ScryptParameters.cpp
  54. ScryptParameters.h
  55. secdiscard.cpp
  56. sehandle.h
  57. Utils.cpp
  58. Utils.h
  59. vdc.cpp
  60. vdc.rc
  61. vold.rc
  62. vold_prepare_subdirs.cpp
  63. VoldNativeService.cpp
  64. VoldNativeService.h
  65. VoldUtil.cpp
  66. VoldUtil.h
  67. VolumeManager.cpp
  68. VolumeManager.h
  69. wait_for_keymaster.cpp
  70. wait_for_keymaster.rc