am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on...
am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
* commit '7fd51b36':
Fix fs_mgr to properly invoke e2fsck on encrypted devices