Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 74e85f18722ae6b6cf562352a3c30e49ae388e9d
commit74e85f18722ae6b6cf562352a3c30e49ae388e9d[log] [tgz]
authorPaul Lawrence <paullawrence@google.com>Mon Apr 27 14:14:36 2015 -0700
committerPaul Lawrence <paullawrence@google.com>Mon Apr 27 14:14:36 2015 -0700
tree9acd1d85c8583398d10ad6aa3bdda22d1804244d
parentc98d1f5883ccc0eb7e424b95556fc13af15d2dfe [diff]
parent86138731da7d96701c51131ecf6e5bb5ee72443d [diff]
resolved conflicts for merge of 86138731 to mnc-dev-plus-aosp

Change-Id: I89203aa1665bb42f9a98fd8b94b933e8406dde02
tree: 9acd1d85c8583398d10ad6aa3bdda22d1804244d
  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.c
  47. VoldCommand.cpp
  48. VoldCommand.h
  49. VoldUtil.c
  50. VoldUtil.h
  51. VolumeBase.cpp
  52. VolumeBase.h
  53. VolumeManager.cpp
  54. VolumeManager.h