Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 6c78e7d7724a431dbdb2b0a5bb8cd2b07424cbe5
commit6c78e7d7724a431dbdb2b0a5bb8cd2b07424cbe5[log] [tgz]
authorTim Murray <timmurray@google.com>Wed Dec 17 16:41:07 2014 -0800
committerTim Murray <timmurray@google.com>Wed Dec 17 16:41:07 2014 -0800
tree3d6aa82dad70adf37fb62f45f69e32403a79c8cc
parent97f3d073ac8cfb8043fcf6ee0b80d5f515ad36c4 [diff]
parent4be3610636674b747839c3f604d25d0c5aa4fc78 [diff]
resolved conflicts for merge of 4be36106 to lmp-mr1-dev-plus-aosp

Change-Id: If504710a618d8c3adf85297d5fd2909558ed57a3
tree: 3d6aa82dad70adf37fb62f45f69e32403a79c8cc
  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