Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / cb33f5741cd37c93f7f1888a3dcbabdfab1524a9
commitcb33f5741cd37c93f7f1888a3dcbabdfab1524a9[log] [tgz]
authorElliott Hughes <enh@google.com>Wed Jun 25 18:25:11 2014 -0700
committerElliott Hughes <enh@google.com>Wed Jun 25 18:31:47 2014 -0700
tree92b978f93e7b674588992828487df0fb1cb343d0
parent62c7af38f2f30b3f152460a8f716fe43e4acad7b [diff]
parentafa60cee4171d0a7e8a9e24c94c4a577905e9d90 [diff]
resolved conflicts for merge of afa60cee to master

Change-Id: I1568def8839bed4d4d2dadbd97194d5603edc627
tree: 92b978f93e7b674588992828487df0fb1cb343d0
  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. vdc.c
  34. VoldCommand.cpp
  35. VoldCommand.h
  36. VoldUtil.c
  37. VoldUtil.h
  38. Volume.cpp
  39. Volume.h
  40. VolumeManager.cpp
  41. VolumeManager.h