Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 33a52284b88349e83456380b62c24d2cf7c7d44e
commit33a52284b88349e83456380b62c24d2cf7c7d44e[log] [tgz]
authorXin Li <delphij@google.com>Tue Jul 09 17:52:38 2019 -0700
committerandroid-build-merger <android-build-merger@google.com>Tue Jul 09 17:52:38 2019 -0700
treeb52ab1054a3361efdd496d85baf3d36c0e39060e
parent70adcce6ac7348206dc0c6085d9d3700973c0f47 [diff]
parentccf6d331b8dc696482ad25e15823ddc039f2e4cf [diff]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 711f4faac3 -s ours am: e7487087d0 -s ours am: 49304ac627
am: ccf6d331b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ee8d1638313ea45cf2bb8e1cdc315127eeb1d15
tree: b52ab1054a3361efdd496d85baf3d36c0e39060e
  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