resolved conflicts for merge of 8ffd5f80 to jb-dev-mako

Change-Id: If3f1a761ea2403d4c58c3e34c07d1edaca4b0d72
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 6d74c16..07bac19 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="crespo wingray panda maguro grouper mako"
+DEVICES="crespo crespo4g wingray panda maguro grouper mako"
 export LC_ALL=C
 
 repo sync -j32 -n