Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: I9bad60dff9effc9d4581cbea1916511cc6628ede

14 files changed, 219 insertions, 8 deletions

diff --git a/Android.mk b/Android.mk
index 5ae29d4..f7e810d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,9 +16,10 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libchips
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-     android-support-compat \
+LOCAL_STATIC_JAVA_LIBRARIES := \
      android-support-annotations
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+     android-support-compat
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := \
      $(call all-java-files-under, src) \
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e07f656..a20eb66 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,7 +21,7 @@
     <string name="copy_number" msgid="530057841276106843">"نسخ رقم الهاتف"</string>
     <string name="action_label" msgid="1318401633653605424">"رجوع"</string>
     <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"اقتراحات جهات الاتصال التي تم فتحها"</string>
-    <string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"لا تتوفر أية اقتراحات"</string>
+    <string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"لا تتوفر أي اقتراحات"</string>
     <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"إزالة <xliff:g id="CONTACT">%s</xliff:g> من المستلمين"</string>
     <string name="chips_action_copy" msgid="1929144660075507103">"نسخ"</string>
     <string name="chips_action_cancel" msgid="6077877438943543501">"إلغاء"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..1f62542
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,34 @@
+<?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">"ইমেইল ঠিকনা প্ৰতিলিপি কৰক"</string>
+    <string name="copy_number" msgid="530057841276106843">"ফ\'ন নম্বৰ প্ৰতিলিপি কৰক"</string>
+    <string name="action_label" msgid="1318401633653605424">"উভতি যাওক"</string>
+    <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"সম্পৰ্কসূচীৰ পৰামৰ্শবোৰ খোলা হ\'ল"</string>
+    <!-- no translation found for accessbility_suggestion_dropdown_closed (5545766162855459747) -->
+    <skip />
+    <!-- no translation found for dropdown_delete_button_desc (8506791557733906887) -->
+    <skip />
+    <!-- no translation found for chips_action_copy (1929144660075507103) -->
+    <skip />
+    <!-- no translation found for chips_action_cancel (6077877438943543501) -->
+    <skip />
+    <!-- no translation found for chips_permission_text (1978301259208877495) -->
+    <skip />
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..cb09e46
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,29 @@
+<?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">"Copy email address"</string>
+    <string name="copy_number" msgid="530057841276106843">"Copy phone number"</string>
+    <string name="action_label" msgid="1318401633653605424">"Return"</string>
+    <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"Contact suggestions opened"</string>
+    <string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"No suggestions available"</string>
+    <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"Remove <xliff:g id="CONTACT">%s</xliff:g> from recipients"</string>
+    <string name="chips_action_copy" msgid="1929144660075507103">"Copy"</string>
+    <string name="chips_action_cancel" msgid="6077877438943543501">"Cancel"</string>
+    <string name="chips_permission_text" msgid="1978301259208877495">"Allow contacts suggestions"</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..4100f43
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,29 @@
+<?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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎Copy email address‎‏‎‎‏‎"</string>
+    <string name="copy_number" msgid="530057841276106843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎Copy phone number‎‏‎‎‏‎"</string>
+    <string name="action_label" msgid="1318401633653605424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎Return‎‏‎‎‏‎"</string>
+    <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎Contact suggestions opened‎‏‎‎‏‎"</string>
+    <string name="accessbility_suggestion_dropdown_closed" msgid="5545766162855459747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎No suggestions available‎‏‎‎‏‎"</string>
+    <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎Remove ‎‏‎‎‏‏‎<xliff:g id="CONTACT">%s</xliff:g>‎‏‎‎‏‏‏‎ from recipients‎‏‎‎‏‎"</string>
+    <string name="chips_action_copy" msgid="1929144660075507103">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎Copy‎‏‎‎‏‎"</string>
+    <string name="chips_action_cancel" msgid="6077877438943543501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="chips_permission_text" msgid="1978301259208877495">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎Allow contacts suggestions‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7e79ff6..ab7c560 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,7 +17,7 @@
 <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">"کپی آدرس رایانامه"</string>
+    <string name="copy_email" msgid="7869435992461603532">"کپی نشانی رایانامه"</string>
     <string name="copy_number" msgid="530057841276106843">"کپی شماره تلفن"</string>
     <string name="action_label" msgid="1318401633653605424">"بازگشت"</string>
     <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"پیشنهادات مخاطب باز شد"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 062c39d..03cf296 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -17,7 +17,7 @@
 <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">"ईमेल पत्ता कॉपी करा"</string>
+    <string name="copy_email" msgid="7869435992461603532">"ईमेल अॅड्रेस कॉपी करा"</string>
     <string name="copy_number" msgid="530057841276106843">"फोन नंबर कॉपी करा"</string>
     <string name="action_label" msgid="1318401633653605424">"परत"</string>
     <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"संपर्क सूचना उघडल्या"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..be05820
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,31 @@
+<?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">"ଇମେଲ୍ ଠିକଣା କପୀ କରନ୍ତୁ"</string>
+    <string name="copy_number" msgid="530057841276106843">"ଫୋନ୍‍ ନମ୍ବର କପୀ କରନ୍ତୁ"</string>
+    <string name="action_label" msgid="1318401633653605424">"ଫେରନ୍ତୁ"</string>
+    <string name="accessbility_suggestion_dropdown_opened" msgid="3231589819168382515">"ଯୋଗାଯୋଗ ପରାମର୍ଶ ଖୋଲାଗଲା"</string>
+    <!-- no translation found for accessbility_suggestion_dropdown_closed (5545766162855459747) -->
+    <skip />
+    <string name="dropdown_delete_button_desc" msgid="8506791557733906887">"ପ୍ରାପ୍ତକର୍ତ୍ତାଙ୍କଠାରୁ <xliff:g id="CONTACT">%s</xliff:g>ଙ୍କୁ ବାହାର କରନ୍ତୁ"</string>
+    <string name="chips_action_copy" msgid="1929144660075507103">"କପୀ କରନ୍ତୁ"</string>
+    <string name="chips_action_cancel" msgid="6077877438943543501">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <!-- no translation found for chips_permission_text (1978301259208877495) -->
+    <skip />
+</resources>
diff --git a/sample/Android.mk b/sample/Android.mk
index a572bff..e07caa5 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -21,10 +21,12 @@ include $(CLEAR_VARS)
 src_dirs := src
 LOCAL_PACKAGE_NAME := libChipsSample
 
+LOCAL_STATIC_JAVA_LIBRARIES := \
+     android-support-annotations
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
      libchips \
-     android-support-compat \
-     android-support-annotations
+     android-support-compat
 
 LOCAL_SDK_VERSION := current
 
diff --git a/sample/res/values-as/strings.xml b/sample/res/values-as/strings.xml
new file mode 100644
index 0000000..f3a47fb
--- /dev/null
+++ b/sample/res/values-as/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">"ইমেইল ঠিকনাবোৰ"</string>
+    <string name="phone_numbers" msgid="7836326833170390688">"ফ\'ন নম্বৰসমূহ"</string>
+</resources>
diff --git a/sample/res/values-en-rCA/strings.xml b/sample/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..8cf71de
--- /dev/null
+++ b/sample/res/values-en-rCA/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">"Email Addresses"</string>
+    <string name="phone_numbers" msgid="7836326833170390688">"Phone Numbers"</string>
+</resources>
diff --git a/sample/res/values-en-rXC/strings.xml b/sample/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..333f7cd
--- /dev/null
+++ b/sample/res/values-en-rXC/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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎Email Addresses‎‏‎‎‏‎"</string>
+    <string name="phone_numbers" msgid="7836326833170390688">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎Phone Numbers‎‏‎‎‏‎"</string>
+</resources>
diff --git a/sample/res/values-or/strings.xml b/sample/res/values-or/strings.xml
new file mode 100644
index 0000000..a9f7d01
--- /dev/null
+++ b/sample/res/values-or/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">"ଇମେଲ୍‍ ଠିକଣା"</string>
+    <string name="phone_numbers" msgid="7836326833170390688">"ଫୋନ୍ ନମ୍ଵର୍‍"</string>
+</resources>
diff --git a/tests/Android.mk b/tests/Android.mk
index fa11974..4a6ade6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,7 +20,8 @@ LOCAL_PACKAGE_NAME := libChipsTests
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
-LOCAL_STATIC_JAVA_LIBRARIES := libchips legacy-android-test junit
+LOCAL_STATIC_JAVA_LIBRARIES := libchips junit
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 LOCAL_RESOURCE_DIR := frameworks/opt/chips/res/
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips