commit 8c60aa385359a53ad8e23dd093114da6f4a55469
author Jean-Baptiste Queru <jbq@google.com> Mon Sep 17 14:52:27 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Mon Sep 17 14:52:29 2012 -0700
tree d50766d5f08027a99850339ff27ab9b7da6a2810
parent 0b894b30859cb131f5fa8300fd7f7806b4429082
parent 5f6a33da9e648aeaa247a4871fad5e1b2645de1f

resolved conflicts for merge of 5f6a33da to master

Change-Id: I4803edf72913ada72bddb63f247b77e271f17baa

generate-blob-lists.sh

diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 4b7fde2..bf4dcba 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -72,7 +72,7 @@
   rm -rf device/samsung/manta
   rm -rf device/samsung/crespo*
   rm -rf device/samsung/torospr
-  rm -rf external/bluedroid
+  rm -rf external/bluetooth/bluedroid
   rm -rf external/libnfc-nci
   rm -rf hardware/broadcom/nfc
   rm -rf hardware/msm7k