commit 4db6ebbf4dda94c199413fcb3b6484bd32f2c184
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 22 11:29:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 22 11:29:42 2019 +0000
tree 643335cd96a3092f8e034c40bbb1450c0aac7453
parent b86bae86e17d79a676b68f415882b27ee2653ae5
parent 8614058fbde7ae58b3f45524d912ceb77be3eb17

Merge "Handle navigation back problem from About Phone"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c5c788d..ce17a70 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -901,8 +901,7 @@
 
         <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/about_settings"
-                  android:icon="@drawable/ic_homepage_about"
-                  android:parentActivityName="Settings">
+                  android:icon="@drawable/ic_homepage_about">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
                 <action android:name="android.settings.DEVICE_NAME" />