Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I5e277372f38c608ec70b0636aff424ced7ada549
diff --git a/Android.mk b/Android.mk
index 0fcd4a5..b5b2bbe 100755
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt
LOCAL_PACKAGE_NAME := KeyChain
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4fa2989..703ab22 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -20,7 +20,7 @@
<string name="title_no_certs" msgid="8350009443064722873">"Certifikat nije pronađen."</string>
<string name="title_select_cert" msgid="3588447616418041699">"Odaberite certifikat"</string>
<string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s je zatražila certifikat. Izbor certifikata će omogućiti aplikaciji korištenje ovog identiteta na serverima, sada i ubuduće."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Aplikacija je identifikovala server koji traži certifikat kao %s. Dozvolite aplikaciji da pristupi certifikatu samo ako joj vjerujete."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Aplikacija je identifikovala server koji traži certifikat kao %s. family link da pristupi certifikatu samo ako joj vjerujete."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Možete instalirati certifikate iz PKCS#12 fajla sa ekstenzijom %1$s ili %2$s, koji se nalazi u vanjskoj pohrani."</string>
<string name="install_new_cert_button_label" msgid="903474285774077171">"Instaliraj certifikat"</string>
<string name="allow_button" msgid="3030990695030371561">"Odaberi"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d7bfde4..e49f72e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -24,5 +24,5 @@
<string name="install_new_cert_message" msgid="4451971501142085495">"आप बाहरी मेमोरी में मौजूद %1$s या %2$s एक्सटेंशन वाली PKCS#12 फ़ाइल से प्रमाणपत्र इंस्टॉल कर सकते हैं."</string>
<string name="install_new_cert_button_label" msgid="903474285774077171">"प्रमाणपत्र इंस्टॉल करें"</string>
<string name="allow_button" msgid="3030990695030371561">"चुनें"</string>
- <string name="deny_button" msgid="3766539809121892584">"अस्वीकार करें"</string>
+ <string name="deny_button" msgid="3766539809121892584">"नामंज़ूर करें"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 87cbba2..6695f3f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -28,5 +28,5 @@
<string name="install_new_cert_message" msgid="4451971501142085495">"Unaweza kusakinisha vyeti kutoka katika faili PKCS#12 kwa kirefusho %1$s au %2$s kilicho katika hifadhi ya nje."</string>
<string name="install_new_cert_button_label" msgid="903474285774077171">"Sakinisha cheti"</string>
<string name="allow_button" msgid="3030990695030371561">"Chagua"</string>
- <string name="deny_button" msgid="3766539809121892584">"Kana"</string>
+ <string name="deny_button" msgid="3766539809121892584">"Kataa"</string>
</resources>
diff --git a/robotests/Android.mk b/robotests/Android.mk
index 6165044..dece0df 100644
--- a/robotests/Android.mk
+++ b/robotests/Android.mk
@@ -14,7 +14,7 @@
LOCAL_JAVA_LIBRARIES := \
junit \
- platform-robolectric-3.6.1-prebuilt \
+ platform-robolectric-3.6.2-prebuilt \
telephony-common
LOCAL_INSTRUMENTATION_FOR := KeyChain
@@ -42,4 +42,4 @@
LOCAL_ROBOTEST_TIMEOUT := 36000
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk
