Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 2bbf876f3e0d7d3ced898819f939417b32c71a7b
commit2bbf876f3e0d7d3ced898819f939417b32c71a7b[log] [tgz]
authorXin Li <delphij@google.com>Thu Sep 05 15:19:11 2019 -0700
committerandroid-build-merger <android-build-merger@google.com>Thu Sep 05 15:19:11 2019 -0700
treea6659cfb0d9bb7b6a169a54435cfbf517d002c7a
parentd7cffba6f4ce7b735f88e9b16e728dd3ccbb94a0 [diff]
parentae4ee5e447d5994a9e938cffbefd11c14961ed75 [diff]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours am: 9938a041f4 am: 33658d3c27
am: ae4ee5e447 -s ours
am skip reason: subject contains skip directive

Change-Id: I3c6f32d9d8e41cb8d1ae99d5e0c9ada0446a811f
tree: a6659cfb0d9bb7b6a169a54435cfbf517d002c7a
  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