merge intel x86 patches into gingerbread branch

diff --git a/misc/Android.mk b/misc/Android.mk
index 66ffe91..0094869 100644 (file)
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -140,7 +140,7 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \
        -DHAVE_GETOPT_H
 
 LOCAL_MODULE := badblocks
-LOCAL_MODULE_TAGS := systembuilder
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_SYSTEM_SHARED_LIBRARIES := \
        libext2fs \