Gitiles
Code Review Sign In
review.gerrithub.io / BlissRoms-x86 / platform_system_vold / refs/heads/n7.1-x86
commit5211fb70f2a0887b617502785e29bac17f5708a1[log] [tgz]
authorelectrikjesus <electrikjesus@gmail.com>Tue Nov 29 15:08:53 2016 -0800
committerelectrikjesus <electrikjesus@gmail.com>Tue Nov 29 15:08:53 2016 -0800
tree94b395af9a26716f4f2455c807154861b15108e3
parent39a8ebe7f29006385f108b6ed798736cdea6bedd [diff]
parent5e002c20388c63c3694e59d8ed0d162da1bc3874 [diff]
Merge remote-tracking branch 'refs/remotes/BR-x86/n7.0-x86'

Conflicts:
	Android.mk
	fs/Ext4.cpp
	fs/F2fs.cpp
tree: 94b395af9a26716f4f2455c807154861b15108e3
  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.c
  18. cryptfs.h
  19. Devmapper.cpp
  20. Devmapper.h
  21. Disk.cpp
  22. Disk.h
  23. DiskPartition.cpp
  24. DiskPartition.h
  25. EmulatedVolume.cpp
  26. EmulatedVolume.h
  27. Ext4Crypt.cpp
  28. Ext4Crypt.h
  29. hash.h
  30. Keymaster.cpp
  31. Keymaster.h
  32. KeyStorage.cpp
  33. KeyStorage.h
  34. Loop.cpp
  35. Loop.h
  36. main.cpp
  37. MoveTask.cpp
  38. MoveTask.h
  39. NetlinkHandler.cpp
  40. NetlinkHandler.h
  41. NetlinkManager.cpp
  42. NetlinkManager.h
  43. PrivateVolume.cpp
  44. PrivateVolume.h
  45. Process.cpp
  46. Process.h
  47. PublicVolume.cpp
  48. PublicVolume.h
  49. ResponseCode.cpp
  50. ResponseCode.h
  51. ScryptParameters.cpp
  52. ScryptParameters.h
  53. secdiscard.cpp
  54. secontext.cpp
  55. secontext.h
  56. sehandle.h
  57. TrimTask.cpp
  58. TrimTask.h
  59. Utils.cpp
  60. Utils.h
  61. vdc.cpp
  62. vdc.rc
  63. vold.c
  64. vold.h
  65. vold.rc
  66. VoldCommand.cpp
  67. VoldCommand.h
  68. VoldUtil.c
  69. VoldUtil.h
  70. VolumeBase.cpp
  71. VolumeBase.h
  72. VolumeManager.cpp
  73. VolumeManager.h