Elliott Hughes 32e9163b2a resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp ... Change-Id: I6efd0d4a0ece0b065d02796916355ad5ae8b4eea		2014-12-09 19:12:21 -08:00
..
include	Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""	2014-12-09 17:02:17 -08:00
Android.mk	Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""	2014-12-09 17:02:17 -08:00
fs_mgr.c	Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""	2014-12-09 17:02:17 -08:00
fs_mgr_fstab.c	Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""	2014-12-09 17:02:17 -08:00
fs_mgr_main.c	Cleanup: warning fixit.	2014-04-11 16:15:46 -07:00
fs_mgr_priv.h	fs_mgr: fix crash on "noemulatedsd" in fstab	2014-07-01 17:57:13 -07: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_verity.c	resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp	2014-12-09 19:12:21 -08:00