summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2013-10-08 21:52:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-08 21:52:53 +0000
commit0720b0e8ae46cfc4e7a498a78045db9197e90ed2 (patch)
treeeb2fc4cdd0cc5b9ec5be9d5377463bd84d045549 /AndroidManifest.xml
parentd7cc21592fee49dbe3e1c65a1968ce0f4e96d85f (diff)
parentadb742ca30da01a3f09be5551f0844f170eaa5d8 (diff)
downloadandroid_packages_apps_Dialer-0720b0e8ae46cfc4e7a498a78045db9197e90ed2.tar.gz
android_packages_apps_Dialer-0720b0e8ae46cfc4e7a498a78045db9197e90ed2.tar.bz2
android_packages_apps_Dialer-0720b0e8ae46cfc4e7a498a78045db9197e90ed2.zip
Merge "Do not use implicit intent to up nav to call log." into klp-dev
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 46a5387ad..b0d988c60 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -146,6 +146,7 @@
android:theme="@style/CallDetailActivityTheme"
android:screenOrientation="portrait"
android:icon="@mipmap/ic_launcher_phone"
+ android:parentActivityName="com.android.dialer.calllog.CallLogActivity"
>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>