David Zeuthen 80364b94bc am 6ca11db7: Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect." ... * commit '6ca11db7b7dc5e141c767b38328c3838a3b90b60': fs_mgr: Fix ENOMEM behavior when dealing with slotselect.		2015-09-09 22:52:32 +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: Use slot_suffix field from bootloader_message.	2015-09-08 15:54:32 -04:00
fs_mgr_verity.c	Update partition.*.verified even with ro.boot.veritymode set	2015-07-15 09:11:13 +00:00