tree e933d945141044e1b4ee7b086c21f0c33bf46672
parent c868fcf37d2c5dced76a48fe79c2020c24ad61ad
parent cb60b5d337315eeabbdfb17f150a3e88fd351e60
author Mohamad Ayyash <mkayyash@google.com> 1428520195 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428520195 +0000

am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"

* commit '70f81ceeeb1c88a164b0e02e05110043ceef8885':
  fs_mgr_verity: Add support for squashfs