Merge "Fail scan request if no channels are available" into oc-mr1-dev
am: 7ce813a612

Change-Id: I48fa59e26cd5bf5ced0bf92a655fc04f4295d39f
diff --git a/service/Android.mk b/service/Android.mk
index e1bac28..5b539e5 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -74,11 +74,6 @@
 LOCAL_DEX_PREOPT_GENERATE_PROFILE := true
 LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := frameworks/base/services/art-profile
 
-ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
-LOCAL_EMMA_INSTRUMENT := true
-endif
-
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.server.wifi.*
 
 include $(BUILD_JAVA_LIBRARY)