commit e0bd2408a04bd8b96b796eedc024ff3b2c85a0f7
author Mohamad Ayyash <mkayyash@google.com> Fri May 01 23:34:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 01 23:34:19 2015 +0000
tree d4a54790b40b11787de9e7107dbd8f036c37ab21
parent ba2798c956dfbcc58cbaa735e28ba5b0a7158df0
parent 817e4c9bec4c584cdcab05b39153d19882daaa49

am 817e4c9b: am 6e66fc94: am c112341b: Merge "common.py: Add support for squashfs"

* commit '817e4c9bec4c584cdcab05b39153d19882daaa49':
  common.py: Add support for squashfs

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index d0b9e57..e05ee3c 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1224,7 +1224,8 @@
     "mtd": "MTD",
     "ext4": "EMMC",
     "emmc": "EMMC",
-    "f2fs": "EMMC"
+    "f2fs": "EMMC",
+    "squashfs": "EMMC"
 }
 
 def GetTypeAndDevice(mount_point, info):