tree f1662014f6d158783b3e6d9cf2cceec925781b0c
parent 3cc5148007a7ad2ff0b868ae89c7835286dd148c
parent 4e6507f32817e2943b1f27d12f56b485993c2a44
author Tao Bao <tbao@google.com> 1436229068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436229068 +0000

am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"

* commit '4e6507f32817e2943b1f27d12f56b485993c2a44':
  Allow mounting squashfs partitions