Merge tag 'android-6.0.0_r26' into cm-13.0stable/cm-13.0-ZNH0E

Android 6.0.0 release 26

3 files changed, 48 insertions, 2 deletions

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..4c52a95
--- /dev/null
+++ b/res/values-pt-rBR/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="copy_email" msgid="7869435992461603532">"Copiar endereço de e-mail"</string>
+    <string name="copy_number" msgid="530057841276106843">"Copiar número de telefone"</string>
+    <string name="action_label" msgid="1318401633653605424">"Enter"</string>
+    <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"Sugestões de contato ativadas"</string>
+    <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"Remover <xliff:g id="CONTACT">%s</xliff:g> dos destinatários"</string>
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 11e1d80..784641f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,8 +17,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="more_string" msgid="8495478259330621990">"+<xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="copy_email" msgid="7869435992461603532">"Copiaţi adresa de e-mail"</string>
-    <string name="copy_number" msgid="530057841276106843">"Copiaţi numărul de telefon"</string>
+    <string name="copy_email" msgid="7869435992461603532">"Copiați adresa de e-mail"</string>
+    <string name="copy_number" msgid="530057841276106843">"Copiați numărul de telefon"</string>
     <string name="action_label" msgid="1318401633653605424">"Enter"</string>
     <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"Sugestii de persoane de contact disponibile"</string>
     <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"Eliminați <xliff:g id="CONTACT">%s</xliff:g> din destinatari"</string>
diff --git a/sample/res/values-pt-rBR/strings.xml b/sample/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..5f8e346
--- /dev/null
+++ b/sample/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="email_addresses" msgid="5320415175940315400">"Endereços de e-mail"</string>
+    <string name="phone_numbers" msgid="7836326833170390688">"Números de telefone"</string>
+</resources>