Jiyong Park 28bd98999b resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2 Change-Id: Iadfcd7e75044d62f2015dc62c69ee68869b40cd7		2017-06-28 22:52:25 +09:00
..
include	resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp	2017-06-28 22:52:25 +09:00
include_fstab/fstab	resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp	2017-06-28 22:52:25 +09:00
.clang-format	Fix-up coding style	2017-02-18 12:33:36 +08:00
Android.bp	resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp	2017-06-28 22:52:25 +09:00
Android.mk	fs_mgr: convert libfs_mgr to Android.bp	2017-05-12 17:06:55 -07:00
fs_mgr.cpp	Merge "AVB: allow no metadata in the generic system.img for project Treble" am: c70bf5836c am: caa5b4417f	2017-06-24 01:51:47 +00:00
fs_mgr_avb.cpp	AVB: allow no metadata in the generic system.img for project Treble	2017-06-24 09:20:15 +08:00
fs_mgr_avb_ops.cpp	AVB: allow no metadata in the generic system.img for project Treble	2017-06-24 09:20:15 +08:00
fs_mgr_boot_config.cpp	fs_mgr: remove the repetitive and annoying bootconfig error print	2017-04-20 14:41:23 -07:00
fs_mgr_dm_ioctl.cpp	Fix-up coding style	2017-02-18 12:33:36 +08:00
fs_mgr_format.cpp	fs_mgr: call format_f2fs correctly with -f	2017-06-05 13:57:15 -07:00
fs_mgr_fstab.cpp	Merge "first stage mount: removing the restriction of mount points" am: 5218d69817 am: 7d491a0a7b	2017-06-09 02:00:38 +00:00
fs_mgr_main.cpp	fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>	2017-01-26 21:47:55 +08:00
fs_mgr_priv.h	Support metadata encryption	2017-04-21 14:26:00 -07:00
fs_mgr_priv_avb_ops.h	fs_mgr: Update for new libavb API.	2017-05-15 12:04:18 -04:00
fs_mgr_priv_boot_config.h	early_mount: fs_mgr: move all fstab logic into fs_mgr	2017-02-23 16:48:43 -08:00
fs_mgr_priv_dm_ioctl.h	Fix-up coding style	2017-02-18 12:33:36 +08:00
fs_mgr_priv_sha.h	fs_mgr_avb: refactors how vbmeta is loaded	2017-04-14 21:50:55 +08:00
fs_mgr_slotselect.cpp	fs_mgr: adding fs_mgr_get_slot_suffix() public API	2017-04-14 21:49:33 +08:00
fs_mgr_verity.cpp	fs_mgr: check console-ramoops-0	2017-06-27 09:10:16 -07:00