Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / b4ef84d704cf099585b113db533548be415367c5
commitb4ef84d704cf099585b113db533548be415367c5[log] [tgz]
authorDan Albert <danalbert@google.com>Fri Sep 12 13:05:56 2014 -0700
committerDan Albert <danalbert@google.com>Fri Sep 12 13:06:50 2014 -0700
tree3e2e66042274db4db389846ad918095cca8709fd
parent9b6db0abe436a1fb7f898d9729eec5217933b776 [diff]
parent2b2a0bec0cf350ae6239d7b2a31c5a328ddb2b32 [diff]
resolved conflicts for merge of 2b2a0bec to lmp-dev-plus-aosp

Change-Id: I224499833777ef80d85c1199f475f5ed1568d053
tree: 3e2e66042274db4db389846ad918095cca8709fd
  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