Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd am: 7c4b70c6e5

am: 05281b8d4b

Change-Id: If7b7e7fab2aa0e8d81d185363685b419d5630cb1
This commit is contained in:
Youming Ye
2018-08-30 16:07:40 -07:00
committed by android-build-merger

View File

@@ -2709,8 +2709,7 @@
<activity
android:name="Settings$WifiCallingSettingsActivity"
android:label="@string/wifi_calling_settings_title"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
android:taskAffinity="com.android.settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.WIFI_CALLING_SETTINGS" />