resolved conflicts for merge of 447b9743 to master

Change-Id: Iffc8b1a0e373d5819948053610ac0b346f096172

diff --cc generate-blob-lists.sh
index 62c62db,e827e9b..cd75be0
--- 1/generate-blob-lists.sh
--- 2/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@@ -42,7 -42,7 +42,7 @@@ the
  fi
  shift
  
- DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro manta"
 -DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro grouper"
++DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro grouper manta"
  export LC_ALL=C
  
  repo sync -j32 -n