AUTOMATED - git apply results

uazo · Jan 12, 2024 · 851f240 · 851f240
1 parent 3f3f0cb
commit 851f240
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/patches/00Enable-gwp-asan-on-Android.patch b/build/patches/00Enable-gwp-asan-on-Android.patch
@@ -124,7 +124,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
 diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
 --- a/chrome/app/chrome_main_delegate.cc
 +++ b/chrome/app/chrome_main_delegate.cc
-@@ -1940,7 +1940,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
+@@ -1935,7 +1935,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
    const version_info::Channel channel = chrome::GetChannel();
    const bool is_canary_dev = (channel == version_info::Channel::CANARY ||
                                channel == version_info::Channel::DEV);

diff --git a/build/patches/00Temp-disable-predictive-back-gesture.patch b/build/patches/00Temp-disable-predictive-back-gesture.patch
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -188,7 +188,7 @@ by a child template that "extends" this file.
+@@ -189,7 +189,7 @@ by a child template that "extends" this file.
          android:networkSecurityConfig="@xml/network_security_config"
          android:allowAudioPlaybackCapture="false"
          android:appComponentFactory="org.chromium.chrome.browser.base.SplitCompatAppComponentFactory"