Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / dfc7eb46e04489c23bc5e5572e02af1c8b0d9b45
commitdfc7eb46e04489c23bc5e5572e02af1c8b0d9b45[log] [tgz]
authorSzuWei Lin <szuweilin@google.com>Tue Feb 12 12:54:44 2019 +0800
committerSzuWei Lin <szuweilin@google.com>Tue Feb 12 12:54:44 2019 +0800
tree7ee1f349ed2625353359dcd292c20d1d91183eac
parentab1cec2de853ef202f7fb05c7f29ad91949298ab [diff]
parentc03435f532753b8bd6816d4500ffeb3dcb167a57 [diff]
resolve merge conflicts of c03435f532753b8bd6816d4500ffeb3dcb167a57 to pie-gsi

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