Sami Tolvanen 049399e570 am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for invalid signatures" ... * commit 'ad2a5a89a680804b927fc123e952c5bb5e75b9c8': fs_mgr: trigger dm-verity error handling for invalid signatures		2015-09-30 20:04:51 +00:00
..
include	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
Android.mk	resolved conflicts for d8eed7ff to stage-aosp-master	2015-09-09 12:40:16 -04:00
fs_mgr.c	am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"	2015-08-19 22:31:08 +00:00
fs_mgr_format.c	fs_config: replace getenv('OUT') by new fs_config parameter	2015-07-09 21:47:07 -07:00
fs_mgr_fstab.c	am 6ca11db7: Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect."	2015-09-09 22:52:32 +00:00
fs_mgr_main.c	Cleanup: warning fixit.	2014-04-11 16:15:46 -07:00
fs_mgr_priv.h	resolved conflicts for d8eed7ff to stage-aosp-master	2015-09-09 12:40:16 -04: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_slotselect.c	fs_mgr: Error out if unable to determine slot_suffix	2015-09-11 12:53:18 -04:00
fs_mgr_verity.c	fs_mgr: trigger dm-verity error handling for invalid signatures	2015-09-25 15:01:33 +01:00