Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / 137858b43b7e0ed46fb8ebce9230eb40f0a62432
commit137858b43b7e0ed46fb8ebce9230eb40f0a62432[log] [tgz]
authorDavid 'Digit' Turner <digit@google.com>Thu Jul 14 07:35:14 2011 +0200
committerDavid 'Digit' Turner <digit@google.com>Thu Jul 14 07:35:14 2011 +0200
treec718be2a893245b4be6e025751d5deffbb811a79
parent2c9d8de79a0dd7f894c65777a197c86486aff96c [diff]
parent5284bcffed2788b26399bec7150831eb8d9da74f [diff]
resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp

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