Jin Qian c64f11ef64 resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp ... Change-Id: I968f88ea425fb69a0395451fa290f1947e185859		2016-11-18 15:55:51 -08:00
..
include	Merge "Add support for max_comp_streams option for zram"	2016-11-18 23:25:21 +00:00
Android.mk	libcrypto_utils: convert to Soong.	2016-08-05 18:07:36 -07:00
fs_mgr.c	Merge "Add support for max_comp_streams option for zram"	2016-11-18 23:25:21 +00:00
fs_mgr_format.c	Update the header path for ext4_utils.	2016-10-09 10:23:36 -07:00
fs_mgr_fstab.c	resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp	2016-11-18 15:55:51 -08:00
fs_mgr_main.c	fs_mgr: fix clang static analyzer warning	2016-11-08 20:07:31 +00:00
fs_mgr_priv.h	resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp	2016-11-18 15:55:51 -08: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: Track the bootloader_message struct change.	2016-06-09 15:13:15 -07:00
fs_mgr_verity.cpp	fs_mgr: Fix disable-verity for verifyatboot partitions am: dd78ae75ff	2016-11-16 21:15:08 +00:00