tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 04d9b8501a58de6ee7c5aa3635673150bf88cb06
parent 2fc4d4359b268cbf3d0f73d670a219f12d440e86
author Tao Bao <tbao@google.com> 1440646688 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646688 +0000

am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"

* commit '2fc4d4359b268cbf3d0f73d670a219f12d440e86':