commit 6f90d21defc7e422c21cad3445fd170195c16d61
author Bill Yi <byi@google.com> Wed Jul 26 17:06:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 17:06:01 2017 +0000
tree e24bdd0a9f4b91b0d951471ac3d42602de85b6a0
parent da238095c9600f1b1c6c338a4227e5139e1e614d
parent 3025a229ba6ad4336736749baeaa2736084c9a7d

Import translations. DO NOT MERGE
am: 3025a229ba  -s ours

Change-Id: I1b240370982c3797a2db5797c0c04edddb098ed0

java/res/values-pt-rPT/strings-emoji-descriptions.xml

diff --git a/java/res/values-pt-rPT/strings-emoji-descriptions.xml b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
index 6bc3dce..1096aac 100644
--- a/java/res/values-pt-rPT/strings-emoji-descriptions.xml
+++ b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
@@ -25,7 +25,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de Direitos de Autor"</string>
+    <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de direitos de autor"</string>
     <string name="spoken_emoji_00AE" msgid="7708335454134589027">"Símbolo de marca registada"</string>
     <string name="spoken_emoji_203C" msgid="153340916701508663">"Duplo ponto de exclamação"</string>
     <string name="spoken_emoji_2049" msgid="4877256448299555371">"Pontos de exclamação e de interrogação"</string>

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 12d9cbe..998c1de 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,8 +26,9 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target-minus-junit4 \
-    legacy-android-test
+    mockito-target-minus-junit4
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)