| Index: chrome/android/java/AndroidManifest.xml
|
| diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
| index c3820ddb524bf3218d5aa1b2e7592dee4ced88ae..ccbbdfc947f93d8047f7baaa2c1ea5efdbe0de4c 100644
|
| --- a/chrome/android/java/AndroidManifest.xml
|
| +++ b/chrome/android/java/AndroidManifest.xml
|
| @@ -425,12 +425,6 @@ by a child template that "extends" this file.
|
| android:excludeFromRecents="true">
|
| </activity>
|
|
|
| - <activity android:name="org.chromium.chrome.browser.childaccounts.ResetDataActivity"
|
| - android:theme="@android:style/Theme.Translucent.NoTitleBar"
|
| - android:exported="true"
|
| - android:excludeFromRecents="true">
|
| - </activity>
|
| -
|
| <!-- This activity is started along with IncognitoDocumentActivity, so it also must
|
| disable hardware acceleration. Besides, it doesn't have any UI. -->
|
| <activity android:name="org.chromium.chrome.browser.document.CipherKeyActivity"
|
|
|