Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / cf5c9907f580455d925c388339a2d69630242fd9
commitcf5c9907f580455d925c388339a2d69630242fd9[log] [tgz]
authorLuis Hector Chavez <lhchavez@google.com>Tue Jun 05 10:10:08 2018 -0700
committerLuis Hector Chavez <lhchavez@google.com>Tue Jun 05 10:10:08 2018 -0700
tree9fe8ed728f052a5ee8d715f9f3d5b2b3addf4141
parent82208b730fa18a39abb19e67b4d744aecc12678c [diff]
parent7bf98aa8a0c122aec9f3262fe1a24238d57ae8d0 [diff]
resolve merge conflicts of 7bf98aa8a0c122aec9f3262fe1a24238d57ae8d0 to pi-dev-plus-aosp

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08252155f04e8b414f2149d8b29e5e2fff6bcc82
tree: 9fe8ed728f052a5ee8d715f9f3d5b2b3addf4141
  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