tree f1662014f6d158783b3e6d9cf2cceec925781b0c
parent dabc89e7b34205d0e9d70be15c9f28eddd4f3b39
parent e93fa6b7428a7bdd6386159b417d70090b20f2df
author Tao Bao <tbao@google.com> 1436239384 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436239384 +0000

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

* commit 'e93fa6b7428a7bdd6386159b417d70090b20f2df':
  Allow mounting squashfs partitions