commit 495001bba85f900f7a12ab538aae2b332a229547
author The Android Automerger <android-build@google.com> Thu Jan 15 06:10:16 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 15 06:10:16 2015 -0800
tree bbc2974c13b4d17087b298e0f33593ba585417cd
parent f0a2a8b2f8b652ed251d96deec6e1d59ce693839
parent f37376989badaf9f297a9d74a81df6b788d9ca97

merge in lmp-mr1-release history after reset to lmp-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d23e74a..69cf2a5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -260,7 +260,7 @@
                 <data android:mimeType="vnd.android.cursor.item/person" />
             </intent-filter>
 
-            <intent-filter android:label="@string/viewContactDesription">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/person" />