Merge chips from jb-ub-mail-ur11 into klp-ub-dev

Change-Id: Ied8877d7613ca1dbb5047a0c8c611a1138fc47e3
diff --git a/chips/tests/AndroidManifest.xml b/chips/tests/AndroidManifest.xml
index b84aecf..b2b307e 100644
--- a/chips/tests/AndroidManifest.xml
+++ b/chips/tests/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.ex.chipstests"
+        package="com.android.ex.chips.tests"
         android:sharedUserId="com.android.uid.test">
 
     <application>
@@ -24,7 +24,7 @@
 
     <!-- Run tests with "runtest android-common" -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.android.ex.chipstests"
+            android:targetPackage="com.android.ex.chips.tests"
             android:label="Chips Tests" />
 
 </manifest>