Elliott Hughes 182e561932 am 450a24a5: am c604ccfa: Merge "Only pass nomblk_io_submit option when mounting ext4" ... * commit '450a24a598b816b71dddde121460dc4fd3fdd3fd': Only pass nomblk_io_submit option when mounting ext4		2015-06-11 02:31:53 +00:00
..
include	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
Android.mk	resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp	2015-04-13 16:29:05 -07:00
fs_mgr.c	am 450a24a5: am c604ccfa: Merge "Only pass nomblk_io_submit option when mounting ext4"	2015-06-11 02:31:53 +00:00
fs_mgr_format.c	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
fs_mgr_fstab.c	am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev	2015-05-13 17:07:53 +00:00
fs_mgr_main.c	Cleanup: warning fixit.	2014-04-11 16:15:46 -07:00
fs_mgr_priv.h	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
fs_mgr_priv_verity.h	Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""	2014-12-09 17:02:17 -08:00
fs_mgr_verity.c	fs_mgr: Use ro.boot.veritymode	2015-06-10 17:40:29 +01:00