Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 2d907482fd86cd2941b7278c0f72d8841ad983b5
commit2d907482fd86cd2941b7278c0f72d8841ad983b5[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Mon Mar 11 20:51:43 2013 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Mar 11 20:51:43 2013 +0000
tree5fa7786ade1bc93ac499db8db42eecdb9a7c64d3
parent286374f16610323722ae4a3871be4b8d4c2b0001 [diff]
parent6bbf28da27dde1d3154456ab44a68ff62ee81c3c [diff]
am 6bbf28da: (-s ours) am c004cfd8: am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6bbf28da27dde1d3154456ab44a68ff62ee81c3c':
tree: 5fa7786ade1bc93ac499db8db42eecdb9a7c64d3
  1. tests/
  2. Android.mk
  3. Asec.h
  4. CleanSpec.mk
  5. CommandListener.cpp
  6. CommandListener.h
  7. cryptfs.c
  8. cryptfs.h
  9. Devmapper.cpp
  10. Devmapper.h
  11. DirectVolume.cpp
  12. DirectVolume.h
  13. Ext4.cpp
  14. Ext4.h
  15. Fat.cpp
  16. Fat.h
  17. hash.h
  18. Loop.cpp
  19. Loop.h
  20. main.cpp
  21. NetlinkHandler.cpp
  22. NetlinkHandler.h
  23. NetlinkManager.cpp
  24. NetlinkManager.h
  25. Process.cpp
  26. Process.h
  27. ResponseCode.cpp
  28. ResponseCode.h
  29. vdc.c
  30. VoldCommand.cpp
  31. VoldCommand.h
  32. VoldUtil.h
  33. Volume.cpp
  34. Volume.h
  35. VolumeManager.cpp
  36. VolumeManager.h
  37. Xwarp.cpp
  38. Xwarp.h