Chih-Hung Hsieh 5fb629a212 resolve merge conflicts of e845c04 to nyc-dev-plus-aosp ... Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6		2016-05-27 16:04:21 -07:00
..
include	resolve merge conflicts of e845c04 to nyc-dev-plus-aosp	2016-05-27 16:04:21 -07:00
Android.mk	Switch fs_mgr and adb to libcrypto_utils.	2016-04-12 23:04:11 +00:00
fs_mgr.c	Merge "If we fail to format a blank partition, try recovery" into nyc-dev	2016-05-03 23:22:58 +00:00
fs_mgr_format.c	Merge "Cleanup uses of sprintf so we can deprecate it." am: 2c5b89a64a	2016-03-08 07:41:39 +00:00
fs_mgr_fstab.c	resolve merge conflicts of 2857bd1 to nyc-dev	2016-04-12 14:28:09 -07:00
fs_mgr_main.c	Cleanup: warning fixit.	2014-04-11 16:15:46 -07:00
fs_mgr_priv.h	resolve merge conflicts of 2857bd1 to nyc-dev	2016-04-12 14:28:09 -07:00
fs_mgr_priv_verity.h	Fix misc-macro-parentheses warnings in init and other core modules.	2016-05-18 18:11:49 -07: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.cpp	fs_mgr: update block device reference in verity metadata	2016-05-16 16:37:24 +00:00