merge in oc-release history after reset to 718318bbb8d60abaf755eede9215e8fa95da3235
diff --git a/tests/Android.mk b/tests/Android.mk
index 86cac8a..97e8d6d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -8,7 +8,6 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CalendarProviderTests
-LOCAL_COMPATIBILITY_SUITE := device-tests
 
 LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test