From 87c7f56d3521e2519908e43ba3e820f4b5c7ace4 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Thu, 28 Mar 2019 15:18:40 +0800
Subject: [PATCH] Fix navigation back problem from Assist app

Fixes: 127907113
Test: visual
Change-Id: I07196ee9f92f9d84fa75eb32cb6564b362f1293d
---
 AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4166d6f0624..421de25a03d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -607,8 +607,7 @@
 
         <activity
             android:name="Settings$ManageAssistActivity"
-            android:label="@string/assist_and_voice_input_title"
-            android:parentActivityName="Settings">
+            android:label="@string/assist_and_voice_input_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />