Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I7d72ca5a68c52b05adf34ca27239036c58ce1e79
Change-Id: I41e1127c78688eb0a6b94048ad862e00b4e59242

4 files changed, 9 insertions, 7 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d2f9a07..18759dd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 -->
+
+<!-- versionCode is set to placeholder module version which will
+     be replaced during build. Do not change it!  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
     package="com.android.captiveportallogin"
-    android:versionCode="339990000"
-    android:versionName="339990000">
+    android:versionCode="0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3345d74..b22a9f1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,7 +20,7 @@
     <string name="ssl_security_warning_title" msgid="7912335118289529802">"የደህንነት ቅንብሮች"</string>
     <string name="ssl_error_view_certificate" msgid="3447891108083278449">"የእውቅና ማረጋገጫን ይመልከቱ"</string>
     <string name="custom_scheme_warning" msgid="1809266150423969087">"ለመቀላቀል እየሞከሩ ያሉት አውታረ መረብ ሌላ መተግበሪያን ለመክፈት ጥያቄ እያቀረበ ነው።"</string>
-    <string name="custom_scheme_example" msgid="7126568152528588592">"ለምሳሌ፣ በመለያ መግቢያው ገፅ ለማረጋገጥ የተወሰነ መተግበሪያ ሊጠይቅ ይችላል"</string>
+    <string name="custom_scheme_example" msgid="7126568152528588592">"ለምሳሌ፣ በመለያ መግቢያው ገጽ ለማረጋገጥ የተወሰነ መተግበሪያ ሊጠይቅ ይችላል"</string>
     <string name="ok" msgid="6584612582120777209">"እሺ"</string>
     <string name="page_info_address" msgid="1290683284404217554">"አድራሻ፦"</string>
     <string name="page_info" msgid="46593086046896385">"የገጽ መረጃ"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 41259ff..84d1681 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -7,7 +7,7 @@
     <string name="action_bar_label" msgid="2023171629563754892">"नेटवर्क मध्‍ये साइन इन करा"</string>
     <string name="action_bar_title" msgid="2566334512545554724">"%1$sमध्‍ये साइन इन करा"</string>
     <string name="ssl_error_warning" msgid="494203210316238046">"ज्या नेटवर्कमध्‍ये तुम्ही सामील होण्याचा प्रयत्न करीत आहात त्यात सुरक्षितता समस्या आहेत."</string>
-    <string name="ssl_error_example" msgid="4574594291839092653">"उदाहरणार्थ, लॉगिन पेज कदाचित दर्शविलेल्या संस्थेशी संबंधित नसेल."</string>
+    <string name="ssl_error_example" msgid="4574594291839092653">"उदाहरणार्थ, लॉगिन पृष्‍ठ कदाचित दर्शविलेल्या संस्थेच्या मालकीचे नसावे."</string>
     <string name="no_bypass_error_vpnwarning" msgid="5263739853101734851">"त्यासोबतच, डिव्हाइस सध्या VPN रन करत असल्यामुळे ही एरर बायपास करता येणे शक्य नाही."</string>
     <string name="error_continue_via_browser" msgid="7091550471744444659">"तरीही ब्राउझरमार्फत सुरू ठेवा"</string>
     <string name="ssl_error_untrusted" msgid="5183246242332501768">"हे प्रमाणपत्र विश्वसनीय संस्थेने दिलेले नाही"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 77c8565..c93ea93 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -6,7 +6,7 @@
     <string name="action_do_not_use_network" msgid="6324702363356892396">"不要使用這個網絡"</string>
     <string name="action_bar_label" msgid="2023171629563754892">"登入網絡"</string>
     <string name="action_bar_title" msgid="2566334512545554724">"登入「%1$s」"</string>
-    <string name="ssl_error_warning" msgid="494203210316238046">"你正在嘗試加入的網絡有安全性問題。"</string>
+    <string name="ssl_error_warning" msgid="494203210316238046">"您正在嘗試加入的網絡有安全性問題。"</string>
     <string name="ssl_error_example" msgid="4574594291839092653">"例如，登入頁面並不屬於所顯示的機構。"</string>
     <string name="no_bypass_error_vpnwarning" msgid="5263739853101734851">"此外，由於裝置目前正在執行 VPN，因此無法略過此錯誤。"</string>
     <string name="error_continue_via_browser" msgid="7091550471744444659">"仍要透過瀏覽器繼續操作"</string>
@@ -19,8 +19,8 @@
     <string name="ssl_error_unknown" msgid="3751419329218834886">"不明的憑證錯誤。"</string>
     <string name="ssl_security_warning_title" msgid="7912335118289529802">"安全性警告"</string>
     <string name="ssl_error_view_certificate" msgid="3447891108083278449">"查看憑證"</string>
-    <string name="custom_scheme_warning" msgid="1809266150423969087">"你嘗試加入的網絡要求你開啟其他應用程式。"</string>
-    <string name="custom_scheme_example" msgid="7126568152528588592">"例如，登入頁面可能會要求你使用特定應用程式進行驗證"</string>
+    <string name="custom_scheme_warning" msgid="1809266150423969087">"您嘗試加入的網絡要求您開啟其他應用程式。"</string>
+    <string name="custom_scheme_example" msgid="7126568152528588592">"例如，登入頁面可能會要求您使用特定應用程式進行驗證"</string>
     <string name="ok" msgid="6584612582120777209">"確定"</string>
     <string name="page_info_address" msgid="1290683284404217554">"電郵地址："</string>
     <string name="page_info" msgid="46593086046896385">"頁面資料"</string>