Merge "Do not trigger scan for reconnect() when wifi is connected" into oc-mr1-dev
am: 87d7badd66

Change-Id: I0839f314c88b32e141e9995832bfd07a42e16d12
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)