tree 48b7ce5bb1c7db0a55acc152dcc262d32f1a267a
parent 89d3634ffe0855456fe4b33b6aa2abdffeeddfc6
parent 2490dbc9325ad522ec5ee031f5493d2e975f3a49
author Tao Bao <tbao@google.com> 1436228555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436228555 +0000

am 2490dbc9: Merge "Allow mounting squashfs partitions"

* commit '2490dbc9325ad522ec5ee031f5493d2e975f3a49':
  Allow mounting squashfs partitions