diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-02-04 09:03:42 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2013-02-04 09:03:42 -0800 |
| commit | f5e5e76065d9dbc6f2334e4bee4af233aaebc14a (patch) | |
| tree | 56a28a7fd9bf3e9d0f2a4c017e16e85951d95050 | |
| parent | cd02a63f3e82d4a40e32feaf231b37245a01b106 (diff) | |
| parent | 16e6db4c3c96638eb81c89c97c58826247a7c8b1 (diff) | |
| download | android_device_common-f5e5e76065d9dbc6f2334e4bee4af233aaebc14a.tar.gz android_device_common-f5e5e76065d9dbc6f2334e4bee4af233aaebc14a.tar.bz2 android_device_common-f5e5e76065d9dbc6f2334e4bee4af233aaebc14a.zip | |
resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aosp
Change-Id: I33f870d3ce6d7855073526d9910ec15de197fd78
| -rwxr-xr-x | generate-blob-lists.sh | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ else 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 |