Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 706efb2254b68a6cd2441b519dd8445ca3df362d
commit706efb2254b68a6cd2441b519dd8445ca3df362d[log] [tgz]
authorNick Kralevich <nnk@google.com>Mon Mar 03 13:12:46 2014 -0800
committerNick Kralevich <nnk@google.com>Mon Mar 03 13:14:41 2014 -0800
tree33ea3bcdeab263b4e707d20c983173760d5159cd
parent3214d1f5a4dbece12e00f1c122e4c2e291715706 [diff]
parent837559720b1cf55c42eb6461fcfa4fc3638acbc2 [diff]
resolved conflicts for merge of 83755972 to klp-modular-dev-plus-aosp

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