Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / f7de12b2640f7433d22220e187c02007026fc4e4
commitf7de12b2640f7433d22220e187c02007026fc4e4[log] [tgz]
authorPaul Lawrence <paullawrence@google.com>Tue Apr 28 14:18:31 2015 -0700
committerPaul Lawrence <paullawrence@google.com>Tue Apr 28 14:19:09 2015 -0700
treea0e8b44a301aecf7fa2dcb1a39116a198d68aaba
parent74e85f18722ae6b6cf562352a3c30e49ae388e9d [diff]
parentbf9dcad78e1590957bcd304553098651911eb8e9 [diff]
resolved conflicts for merge of bf9dcad7 to mnc-dev-plus-aosp

Change-Id: Ic0d4ed7e6c83ad857e2a4a198d069b73fcf399e6
tree: a0e8b44a301aecf7fa2dcb1a39116a198d68aaba
  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. Fat.cpp
  20. Fat.h
  21. fstrim.c
  22. fstrim.h
  23. hash.h
  24. Loop.cpp
  25. Loop.h
  26. main.cpp
  27. MoveTask.cpp
  28. MoveTask.h
  29. NetlinkHandler.cpp
  30. NetlinkHandler.h
  31. NetlinkManager.cpp
  32. NetlinkManager.h
  33. PrivateVolume.cpp
  34. PrivateVolume.h
  35. Process.cpp
  36. Process.h
  37. PublicVolume.cpp
  38. PublicVolume.h
  39. ResponseCode.cpp
  40. ResponseCode.h
  41. sehandle.h
  42. Utils.cpp
  43. Utils.h
  44. vdc.c
  45. VoldCommand.cpp
  46. VoldCommand.h
  47. VoldUtil.c
  48. VoldUtil.h
  49. VolumeBase.cpp
  50. VolumeBase.h
  51. VolumeManager.cpp
  52. VolumeManager.h