commit c48394b162427e25250ecd12f239249a794ea331
author Gary Mai <garymai@google.com> Wed Nov 30 01:38:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 01:38:41 2016 +0000
tree 7cc1f4a3b2053ab153d8ceb397c1af1a22f40edf
parent 491f944621e9ed4f99daff38f8ef8e70d874b9ce
parent 59ebb1b9ff74b384e7a6a30a0bc24a285b81e849

Remove linking options from the ME profile
am: 59ebb1b9ff

Change-Id: Ied402ec7806f0014e4669b80ac6e7b692cc24c8a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 285774d..5bdf99d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10613"
-    android:versionName="1.6.13">
+    android:versionCode="10700"
+    android:versionName="1.7.0">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
 

res/layout/sim_import_list_item.xml

diff --git a/res/layout/sim_import_list_item.xml b/res/layout/sim_import_list_item.xml
index 86f427e..c039570 100644
--- a/res/layout/sim_import_list_item.xml
+++ b/res/layout/sim_import_list_item.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeight"
     android:checkMark="?android:listChoiceIndicatorMultiple"
-    android:duplicateParentState="true"
     android:gravity="center_vertical"
     android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/activity_horizontal_margin"