resolved conflicts for merge of 479368b4 to master

Change-Id: Ie000624d9b3f194d47fc506347c4e4ad5b19101b
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index a59eed3..cae5b74 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="crespo wingray panda maguro grouper manta"
+DEVICES="crespo crespo4g wingray panda maguro grouper manta"
 export LC_ALL=C
 
 repo sync -j32 -n