commit 21b5f6ffca1769cca8b80ec04c3baeb51d9bd324
author Marcus Hagerott <mhagerott@google.com> Wed Nov 30 01:18:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 01:18:39 2016 +0000
tree 6b1057a17f0ddcaf08b7d86365f98cbb47d821cf
parent 5cab57b8c3c523fa220ebb5eeb8cc47e5d558941
parent 2fd79fef44ec3b26b3c0b448569991a9343099b7

Fix greyed out SIM import checkboxes on LMP
am: 2fd79fef44

Change-Id: Ia4130db64ee618fe11ace1ecf1cdd14c75b39906

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" />
 

src/com/android/contacts/ContactsDrawerActivity.java

diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 2e024d4..b6dbe9d 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -438,7 +438,8 @@
                     }
                 });
 
-                updateMenuContentDescription(menuItem, getString(R.string.group_name_dialog_hint));
+                updateMenuContentDescription(menuItem,
+                        getString(R.string.group_edit_field_hint_text));
             }
         }