Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 210caabdb51943ec46532fb13bd3df8b983897e7
commit210caabdb51943ec46532fb13bd3df8b983897e7[log] [tgz]
authorDan Albert <danalbert@google.com>Thu Dec 18 14:08:43 2014 -0800
committerDan Albert <danalbert@google.com>Thu Dec 18 14:08:43 2014 -0800
tree3b156f95668291fe7feee7a756b49892cc73ab60
parent6c78e7d7724a431dbdb2b0a5bb8cd2b07424cbe5 [diff]
parent88aba541a0ce93dc4f2198ff25cce3cf41016e17 [diff]
resolved conflicts for merge of 88aba541 to lmp-mr1-dev-plus-aosp

Change-Id: Ie5ef819dd8168cb6a73f84a881a92c116705fffc
tree: 3b156f95668291fe7feee7a756b49892cc73ab60
  1. tests/
  2. Android.mk
  3. Asec.h
  4. CheckBattery.cpp
  5. CheckBattery.h
  6. CleanSpec.mk
  7. CommandListener.cpp
  8. CommandListener.h
  9. cryptfs.c
  10. cryptfs.h
  11. Devmapper.cpp
  12. Devmapper.h
  13. DirectVolume.cpp
  14. DirectVolume.h
  15. Ext4.cpp
  16. Ext4.h
  17. Fat.cpp
  18. Fat.h
  19. fstrim.c
  20. fstrim.h
  21. hash.h
  22. Loop.cpp
  23. Loop.h
  24. main.cpp
  25. NetlinkHandler.cpp
  26. NetlinkHandler.h
  27. NetlinkManager.cpp
  28. NetlinkManager.h
  29. Process.cpp
  30. Process.h
  31. ResponseCode.cpp
  32. ResponseCode.h
  33. sehandle.h
  34. vdc.c
  35. VoldCommand.cpp
  36. VoldCommand.h
  37. VoldUtil.c
  38. VoldUtil.h
  39. Volume.cpp
  40. Volume.h
  41. VolumeManager.cpp
  42. VolumeManager.h