Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / b7d35115dccc49275c48cc4665c146997b0168eb
commitb7d35115dccc49275c48cc4665c146997b0168eb[log] [tgz]
authorIliyan Malchev <malchev@google.com>Fri Nov 21 00:52:40 2014 -0800
committerIliyan Malchev <malchev@google.com>Fri Nov 21 00:52:40 2014 -0800
treefb8ef204efc5bac8dbd5a418259acf3ee8a51f22
parent9c147fc862bb669cf634b8fd40dc0bec75a197bb [diff]
parent87701e2755f039d6ea8c1510dcddf468ee947a62 [diff]
resolved conflicts for merge of 87701e27 to lmp-mr1-dev-plus-aosp

Change-Id: Ie873baff626fe786515497f2e81aa9db2329168d
tree: fb8ef204efc5bac8dbd5a418259acf3ee8a51f22
  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