merge in oc-release history after reset to master
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6d2ef10..96e7dcb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" product="tablet" msgid="9194799012395299737">"תצורת רשת לנייד"</string>
+ <string name="app_label" product="tablet" msgid="9194799012395299737">"תצורת רשת סלולרית"</string>
<string name="app_label" product="default" msgid="8338087656149558019">"טלפון ואחסון הודעות"</string>
</resources>
diff --git a/tests/Android.mk b/tests/Android.mk
index fc12378..9af28ab 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -3,7 +3,7 @@
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common