Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 1206e872ce74aab253c39c3547bfaadc5e1f6011
commit1206e872ce74aab253c39c3547bfaadc5e1f6011[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Fri Nov 19 10:20:37 2010 -0800
committerJean-Baptiste Queru <jbq@google.com>Fri Nov 19 10:20:37 2010 -0800
treea98aed4569df620e437e4920d246241d3531dac0
parent92c243afae15567f166d0059db5aff13b8849596 [diff]
parent09f774b7d3ad4e4205485b6997d44f7edd084598 [diff]
resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594
tree: a98aed4569df620e437e4920d246241d3531dac0
  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