commit f6593a4e7bcf504c0543a4e3f04b81e531c5eadd
author Brandon Maxwell <maxwelb@google.com> Tue Sep 27 00:55:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 27 00:55:42 2016 +0000
tree 6d6091e25784995eb292763e899280c5828b69fc
parent 88b38d12f8e50237376f580337fda93ed50b9b7e
parent 7f91cbaac97167aee337d84aba214c9b5ff8cdd2

Fixing regression in AOSP CallDetails am: 7457ef708e
am: 7f91cbaac9

Change-Id: I246e0dd20b9d69878f3c1c1ff97fc27519763dfc

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index babd271..6528fdb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -171,6 +171,7 @@
         <activity android:name="com.android.dialer.CallDetailActivity"
             android:label="@string/callDetailTitle"
             android:theme="@style/CallDetailActivityTheme"
+            android:parentActivityName="com.android.dialer.calllog.CallLogActivity"
             android:icon="@mipmap/ic_launcher_phone">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>