merge in oc-release history after reset to master
diff --git a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
index dfbb992..dd505d9 100644
--- a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
@@ -38,6 +38,7 @@
import android.test.mock.MockContentProvider;
import android.test.mock.MockContentResolver;
import android.test.mock.MockContext;
+import android.test.suitebuilder.annotation.SmallTest;
import android.text.TextUtils;
import android.util.Log;
@@ -147,6 +148,7 @@
* Verify that the inserted values match the result of the query and are deleted.
*/
@Test
+ @SmallTest
public void testInsertCarriers() {
// insert test contentValues
ContentValues contentValues = new ContentValues();
@@ -208,6 +210,7 @@
* Verify that the inserted values match the result of the query and are deleted.
*/
@Test
+ @SmallTest
public void testSimTable() {
// insert test contentValues
ContentValues contentValues = new ContentValues();