OSDN Git Service

resolve merge conflicts of 4ad7784 to stage-aosp-master
[android-x86/system-vold.git] / secontext.h
2016-02-17 Bill YiMerge commit '9b5db9bcbe333b677ca18d2c1c398c8751cd0fd2...
2016-02-02 Daichi HironoMerge "Mount appfuse in process namespace."
2016-02-01 Jeff Vander Stoepresolve merge conflicts of 2b6f9ce823 to master.
2016-02-01 Jeffrey Vander StoepMerge "cryptfs: run e2fsck/fsck.f2fs in fsck domain"
2016-02-01 Jeffrey Vander StoepMerge "cryptfs: run e2fsck/fsck.f2fs in fsck domain"
2016-02-01 Jeff Vander Stoepcryptfs: run e2fsck/fsck.f2fs in fsck domain