resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev

This commit is contained in:
Mohamad Ayyash 2015-06-24 15:04:38 -07:00
commit 9ca7fa8993
1 changed files with 2 additions and 1 deletions

View File

@ -1217,7 +1217,8 @@ PARTITION_TYPES = {
"mtd": "MTD",
"ext4": "EMMC",
"emmc": "EMMC",
"f2fs": "EMMC"
"f2fs": "EMMC",
"squashfs": "EMMC"
}
def GetTypeAndDevice(mount_point, info):