Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 781bbab8dd2c9b9b82644c56dc1d4d7ad01c07ef
commit781bbab8dd2c9b9b82644c56dc1d4d7ad01c07ef[log] [tgz]
authorMike Lockwood <lockwood@google.com>Wed Mar 21 15:44:48 2012 -0700
committerMike Lockwood <lockwood@google.com>Wed Mar 21 15:45:26 2012 -0700
treea09a5384911e7b3e56b6881d1dc05be2c5e5cedc
parentb018fe74c29d4ca3a365adf82c710d8c214a71a3 [diff]
parent43b80c229bdee7f32654e2ec561078c5c94c8851 [diff]
Merge commit '43b80c229bdee7f32654e2ec561078c5c94c8851'

empty merge with -s ours

Change-Id: I4c7d6fb13e175af819cab784704e08e9189f6739
tree: a09a5384911e7b3e56b6881d1dc05be2c5e5cedc
  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. Fat.cpp
  14. Fat.h
  15. hash.h
  16. logwrapper.c
  17. Loop.cpp
  18. Loop.h
  19. main.cpp
  20. NetlinkHandler.cpp
  21. NetlinkHandler.h
  22. NetlinkManager.cpp
  23. NetlinkManager.h
  24. Process.cpp
  25. Process.h
  26. ResponseCode.cpp
  27. ResponseCode.h
  28. vdc.c
  29. VoldCommand.cpp
  30. VoldCommand.h
  31. Volume.cpp
  32. Volume.h
  33. VolumeManager.cpp
  34. VolumeManager.h
  35. Xwarp.cpp
  36. Xwarp.h