Snap for 9470583 from 4a805eedcdb169ac66df4556365c8462d2f71d3e to tm-qpr3-release

Change-Id: I07a41a14c94a8f7c52dac8be6c712d84f8b8d3f4
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d616750..2bd3de0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.networkstack"
   android:sharedUserId="android.uid.networkstack"
-  android:versionCode="339990000"
-  android:versionName="339990000"
+  android:versionCode="330400000"
+  android:versionName="330400000"
   coreApp="true"
 >
     <!--- Defines the MAINLINE_NETWORK_STACK permission used by the networkstack process. -->
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index d9f3843..71db3ab 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -19,8 +19,8 @@
     <string name="notification_channel_name_connected" msgid="1795068343200033922">"Captive portal authentication"</string>
     <string name="notification_channel_description_connected" msgid="7239184168268014518">"Notifications shown when the device has successfully authenticated to a captive portal network"</string>
     <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Network venue information"</string>
-    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notifications shown to indicate that the network has a venue information page"</string>
+    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notifications shown to indicate the network has a venue information page"</string>
     <string name="connected" msgid="4563643884927480998">"Connected"</string>
-    <string name="tap_for_info" msgid="6849746325626883711">"Connected/Tap to view website"</string>
+    <string name="tap_for_info" msgid="6849746325626883711">"Connected / Tap to view website"</string>
     <string name="application_label" msgid="1322847171305285454">"Network manager"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index feda547..61a7149 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -21,6 +21,6 @@
     <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Informații despre locația rețelei"</string>
     <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notificări afișate pentru a indica faptul că o rețea are o pagină cu informații despre locație"</string>
     <string name="connected" msgid="4563643884927480998">"Conectată"</string>
-    <string name="tap_for_info" msgid="6849746325626883711">"Conectat / atingeți pentru a vedea site-ul"</string>
+    <string name="tap_for_info" msgid="6849746325626883711">"Conectat / atinge pentru a vedea site-ul"</string>
     <string name="application_label" msgid="1322847171305285454">"Manager de rețea"</string>
 </resources>