commit 447dae19ef55339390c935e86a4841399a0333a0
author Bill Yi <byi@google.com> Thu Jul 27 00:55:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 00:55:29 2017 +0000
tree ad7123686cc9fa93932591702e8dc3320fc8afdf
parent 7011419f06dceee9fbe99b8e0682fea28e56e31b
parent 71e3e281e2f33b18838d5ffd1c9f7c2f81653d3c

Import translations. DO NOT MERGE am: 327f6730c7  -s ours
am: 71e3e281e2  -s ours

Change-Id: Ie97c056f5f0a26d140cd06aebfc569d3c9b6f86b

res/values-es/strings.xml

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5ed5327..e290855 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -128,7 +128,7 @@
     <item msgid="8708754966127584739">"12 semanas"</item>
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"Listo"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Establecer período"</string>
+    <string name="weekpicker_title" msgid="699535378922101701">"Establecer periodo"</string>
     <string name="save_as_playlist" msgid="5180413608901885255">"Guardar como playlist"</string>
     <string name="clear_playlist" msgid="4565515100924905315">"Borrar playlist"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 2e7cfcd..ebf9fe1 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,6 +6,8 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)