resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aosp

Change-Id: I33f870d3ce6d7855073526d9910ec15de197fd78
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 644e1ee..8360da8 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -66,7 +66,6 @@
       cut -b 15- |
       sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt
   done
-  rm -rf device/asus/tilapia
   rm -rf device/lge/*
   rm -rf hardware/broadcom/nfc
   rm -rf hardware/msm7k