Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / system / vold / 0f3e09cb9c5adbdae140694e519cf9a8b241f1ba
commit0f3e09cb9c5adbdae140694e519cf9a8b241f1ba[log] [tgz]
authorJP Abgrall <jpa@google.com>Fri Oct 17 11:41:56 2014 -0700
committerJP Abgrall <jpa@google.com>Fri Oct 17 11:41:56 2014 -0700
tree44ece75df7070461451584aa0fb092b6e5a674f2
parent7fc1de8a44307d6c51826ab90f804702e08d1e6d [diff]
parent7776871d82050bac3e6bb307a68caef973305516 [diff]
resolved conflicts for merge of 7776871d to lmp-mr1-dev

This change was already in lmp-mr1-dev
tree: 44ece75df7070461451584aa0fb092b6e5a674f2
  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