tree a81ad56e1dfa4b7ecebbcd52d9f5e7d46c3215db
parent 5dd81c936eada0ad0be2e9857d726d2e3ab17e30
parent be940153816b28cf1cb68f7f135c77f5f1585fe1
author Mohamad Ayyash <mkayyash@google.com> 1428611684 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428611684 +0000

am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs"""

* commit 'be940153816b28cf1cb68f7f135c77f5f1585fe1':
  Revert "Revert "fs_mgr_verity: Add support for squashfs""