commit 08ff4d12e393a2baf6cb7e1bea454a472bb19c34
author zachh <zachh@google.com> Tue Jun 12 15:37:06 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 12 15:37:06 2018 -0700
tree 3d48ac18fabd4e8af889b7aa87f2ffa9e6622e7c
parent 056eb5b572be86e1334e58db982eaaf8cfccbc43
parent 46e2cd8eb8ee79a6e7078277f29ee8a6eaf422cd

Merge "Replaced a reference in a comment to DialtactsActivity with MainActivity."
am: 46e2cd8eb8

Change-Id: I05588f5971be9549f518a205f78960bf9fe0e20f

java/com/android/incallui/AndroidManifest.xml

diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index 7091d60..4cb6001 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -47,7 +47,7 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
   <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper
-  navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a
+  navigation. Otherwise system could bring up MainActivity instead, e.g. when user unmerge a
   call.
        Set taskAffinity for application is not working because it will be merged and the result is
   that all activities here still have same taskAffinity as activities under dialer. -->