Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / 2996451f777bd8fb00eeb45ccbb1dd57fc0fbe06
commit2996451f777bd8fb00eeb45ccbb1dd57fc0fbe06[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Fri Nov 19 10:25:51 2010 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>Fri Nov 19 10:25:51 2010 -0800
tree9151193c05155e36d4fd677feed3cf4a62fb6528
parent37dcda68d334f70e1f7f69a9817def65fe3ee717 [diff]
parent1206e872ce74aab253c39c3547bfaadc5e1f6011 [diff]
am 1206e872: resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

* commit '1206e872ce74aab253c39c3547bfaadc5e1f6011':
  vold: fix an offset one bug that makes partition 4 unusable
  vold: set state back to idle on formatting error
tree: 9151193c05155e36d4fd677feed3cf4a62fb6528
  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