tree 9eac06c19050abb5f98fb723f436c801ad2d03d8
parent 1ca4b7d26a46d7b779a687f43f2c30ea779693de
parent 7fd51b36dabedee4de159213237e71ba20865812
author Ken Sumrall <ksumrall@android.com> 1352749822 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352749822 -0800

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

* commit '7fd51b36dabedee4de159213237e71ba20865812':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices