Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 6218c51e4b4b31814159b7156fb37a93637529c3
commit6218c51e4b4b31814159b7156fb37a93637529c3[log] [tgz]
authorAdrien Schildknecht <adriens@google.com>Sat Dec 03 04:20:13 2016 +0000
committerandroid-build-merger <android-build-merger@google.com>Sat Dec 03 04:20:13 2016 +0000
treed5e6e86c37b92ae415107d88fc4789acf79a58c0
parent0b1d93b14b3d4cceeb440b9ccd0a45b292efc10c [diff]
parent43100e580f288e28940b86faddb0e51695c72269 [diff]
Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7 am: 93722ead06
am: 43100e580f

Change-Id: I8a74fd730f0aa5a1f94c04c12286e96ac299b463
tree: d5e6e86c37b92ae415107d88fc4789acf79a58c0
  1. bench/
  2. fs/
  3. tests/
  4. Android.mk
  5. Asec.h
  6. AutoCloseFD.h
  7. Benchmark.cpp
  8. Benchmark.h
  9. BenchmarkGen.h
  10. CheckBattery.cpp
  11. CheckBattery.h
  12. CleanSpec.mk
  13. CommandListener.cpp
  14. CommandListener.h
  15. CryptCommandListener.cpp
  16. CryptCommandListener.h
  17. cryptfs.c
  18. cryptfs.h
  19. Devmapper.cpp
  20. Devmapper.h
  21. Disk.cpp
  22. Disk.h
  23. EmulatedVolume.cpp
  24. EmulatedVolume.h
  25. Ext4Crypt.cpp
  26. Ext4Crypt.h
  27. hash.h
  28. Keymaster.cpp
  29. Keymaster.h
  30. KeyStorage.cpp
  31. KeyStorage.h
  32. Loop.cpp
  33. Loop.h
  34. main.cpp
  35. MoveTask.cpp
  36. MoveTask.h
  37. NetlinkHandler.cpp
  38. NetlinkHandler.h
  39. NetlinkManager.cpp
  40. NetlinkManager.h
  41. PrivateVolume.cpp
  42. PrivateVolume.h
  43. Process.cpp
  44. Process.h
  45. PublicVolume.cpp
  46. PublicVolume.h
  47. ResponseCode.cpp
  48. ResponseCode.h
  49. ScryptParameters.cpp
  50. ScryptParameters.h
  51. secdiscard.cpp
  52. secontext.cpp
  53. secontext.h
  54. sehandle.h
  55. TrimTask.cpp
  56. TrimTask.h
  57. Utils.cpp
  58. Utils.h
  59. vdc.cpp
  60. vdc.rc
  61. vold.rc
  62. VoldCommand.cpp
  63. VoldCommand.h
  64. VoldUtil.c
  65. VoldUtil.h
  66. VolumeBase.cpp
  67. VolumeBase.h
  68. VolumeManager.cpp
  69. VolumeManager.h