Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / e05aacfec62c6535731347fe75223f953513cc5f
commite05aacfec62c6535731347fe75223f953513cc5f[log] [tgz]
authorKenny Root <kroot@google.com>Wed May 13 09:35:54 2015 -0700
committerKenny Root <kroot@google.com>Wed May 13 09:36:52 2015 -0700
tree58644df7fc0a520f00078b689646a422a73511a1
parent7239b9294914c792a95d364cfc977d08ec739db1 [diff]
parent9df68a13640f7abddf1b87b0cd4f9e6e9055b8a4 [diff]
resolved conflicts for merge of 9df68a13 to mnc-dev-plus-aosp

Change-Id: I5c72c27ec055195d84c58d0699b46d3942c29dde
tree: 58644df7fc0a520f00078b689646a422a73511a1
  1. tests/
  2. Android.mk
  3. Asec.h
  4. CheckBattery.cpp
  5. CheckBattery.h
  6. CleanSpec.mk
  7. CommandListener.cpp
  8. CommandListener.h
  9. cryptfs.c
  10. cryptfs.h
  11. Devmapper.cpp
  12. Devmapper.h
  13. Disk.cpp
  14. Disk.h
  15. EmulatedVolume.cpp
  16. EmulatedVolume.h
  17. Ext4.cpp
  18. Ext4.h
  19. Ext4Crypt.cpp
  20. Ext4Crypt.h
  21. Fat.cpp
  22. Fat.h
  23. fstrim.c
  24. fstrim.h
  25. hash.h
  26. Loop.cpp
  27. Loop.h
  28. main.cpp
  29. MoveTask.cpp
  30. MoveTask.h
  31. NetlinkHandler.cpp
  32. NetlinkHandler.h
  33. NetlinkManager.cpp
  34. NetlinkManager.h
  35. PrivateVolume.cpp
  36. PrivateVolume.h
  37. Process.cpp
  38. Process.h
  39. PublicVolume.cpp
  40. PublicVolume.h
  41. ResponseCode.cpp
  42. ResponseCode.h
  43. sehandle.h
  44. Utils.cpp
  45. Utils.h
  46. vdc.cpp
  47. VoldCommand.cpp
  48. VoldCommand.h
  49. VoldUtil.c
  50. VoldUtil.h
  51. VolumeBase.cpp
  52. VolumeBase.h
  53. VolumeManager.cpp
  54. VolumeManager.h