Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 6bf0547ccce72233bd465178b919fa7f15e48b45
commit6bf0547ccce72233bd465178b919fa7f15e48b45[log] [tgz]
authorElliott Hughes <enh@google.com>Fri Dec 04 17:55:33 2015 -0800
committerElliott Hughes <enh@google.com>Fri Dec 04 17:55:33 2015 -0800
treeddf19293b96d3be7929a1be9343fbf393788b009
parent51c6b9876a0fa4f0570364b8dc3c4c0351dcd797 [diff]
parentb7d5a47cec7e97b5d73945804e8a41d52a36596b [diff]
resolve merge conflicts of b7d5a47cec to master.

Change-Id: I0c5211a00d92d0ee796bb9c77d2e13675a2a3e8d
tree: ddf19293b96d3be7929a1be9343fbf393788b009
  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. Loop.cpp
  29. Loop.h
  30. main.cpp
  31. MoveTask.cpp
  32. MoveTask.h
  33. NetlinkHandler.cpp
  34. NetlinkHandler.h
  35. NetlinkManager.cpp
  36. NetlinkManager.h
  37. PrivateVolume.cpp
  38. PrivateVolume.h
  39. Process.cpp
  40. Process.h
  41. PublicVolume.cpp
  42. PublicVolume.h
  43. ResponseCode.cpp
  44. ResponseCode.h
  45. secdiscard.cpp
  46. sehandle.h
  47. TrimTask.cpp
  48. TrimTask.h
  49. Utils.cpp
  50. Utils.h
  51. vdc.cpp
  52. vdc.rc
  53. vold.rc
  54. VoldCommand.cpp
  55. VoldCommand.h
  56. VoldUtil.c
  57. VoldUtil.h
  58. VolumeBase.cpp
  59. VolumeBase.h
  60. VolumeManager.cpp
  61. VolumeManager.h