tree 36ce4f4a5fdbcefc7f498014d97071979510039f
parent 14fd915809be03808190af9dd4a70e7cb029998c
parent 8f8d00d552f58fb1ee7e97f485b105214f5c35cc
author Mohamad Ayyash <mkayyash@google.com> 1428530837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428530837 +0000

am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"

* commit 'd411d14a07842563500cb8991f0f8a84fcb1cd8f':
  fs_mgr_verity: Add support for squashfs