commit 9bdcff7bdf72dd69f43c2b3d6fc20474130008c0
author Brandon Maxwell <maxwelb@google.com> Tue Sep 27 02:00:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 02:00:09 2016 +0000
tree 1e7adbd57fff63a0032a02b8e1ce4ba26044f992
parent 7457ef708e5a83657dd5db0d98acba9726e909e4
parent 151b3ae6ada8c2f49ea191a0dfaee5b990afd890

Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev

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