Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / ddb542f5745d37a8d5b72732f67a4e60b895254b
commitddb542f5745d37a8d5b72732f67a4e60b895254b[log] [tgz]
authorPaul Crowley <paulcrowley@google.com>Tue Jun 27 09:33:39 2017 -0700
committerPaul Crowley <paulcrowley@google.com>Wed Jun 28 21:52:46 2017 +0000
tree5bfe06bb56a6f4ae5647ee64032b28df47addb0d
parentdfd04923541de579e99ac8dacc678abb3a3e3f33 [diff]
parent4ad7784b07c476800dcbad1e9a749e02812b2d9e [diff]
resolve merge conflicts of 4ad7784 to stage-aosp-master

Test: Build seems to be unrelatedly broken
Change-Id: I2df307aa1c7134f217c558495e1438412480f324
Merged-In: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
tree: 5bfe06bb56a6f4ae5647ee64032b28df47addb0d
  1. bench/
  2. fs/
  3. tests/
  4. Android.mk
  5. Asec.h
  6. AutoCloseFD.h
  7. Benchmark.cpp
  8. Benchmark.h
  9. BenchmarkGen.h
  10. CheckBattery.cpp
  11. CheckBattery.h
  12. CleanSpec.mk
  13. CommandListener.cpp
  14. CommandListener.h
  15. CryptCommandListener.cpp
  16. CryptCommandListener.h
  17. cryptfs.cpp
  18. cryptfs.h
  19. Devmapper.cpp
  20. Devmapper.h
  21. Disk.cpp
  22. Disk.h
  23. EmulatedVolume.cpp
  24. EmulatedVolume.h
  25. Ext4Crypt.cpp
  26. Ext4Crypt.h
  27. hash.h
  28. Keymaster.cpp
  29. Keymaster.h
  30. KeyStorage.cpp
  31. KeyStorage.h
  32. Loop.cpp
  33. Loop.h
  34. main.cpp
  35. MoveTask.cpp
  36. MoveTask.h
  37. NetlinkHandler.cpp
  38. NetlinkHandler.h
  39. NetlinkManager.cpp
  40. NetlinkManager.h
  41. OWNERS
  42. PrivateVolume.cpp
  43. PrivateVolume.h
  44. Process.cpp
  45. Process.h
  46. PublicVolume.cpp
  47. PublicVolume.h
  48. ResponseCode.cpp
  49. ResponseCode.h
  50. ScryptParameters.cpp
  51. ScryptParameters.h
  52. secdiscard.cpp
  53. secontext.cpp
  54. secontext.h
  55. sehandle.h
  56. TrimTask.cpp
  57. TrimTask.h
  58. Utils.cpp
  59. Utils.h
  60. vdc.cpp
  61. vdc.rc
  62. vold.rc
  63. VoldCommand.cpp
  64. VoldCommand.h
  65. VoldUtil.c
  66. VoldUtil.h
  67. VolumeBase.cpp
  68. VolumeBase.h
  69. VolumeManager.cpp
  70. VolumeManager.h