[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
a749ff3ef3
commit
b7e11987a4
@@ -1010,7 +1010,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
|
||||
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -1696,5 +1696,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -1694,5 +1694,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
// happen silently without prompting an updating dialog.
|
||||
BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -185,7 +185,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
|
||||
--- a/android_webview/BUILD.gn
|
||||
+++ b/android_webview/BUILD.gn
|
||||
@@ -1304,7 +1304,7 @@ declare_args() {
|
||||
@@ -1306,7 +1306,7 @@ declare_args() {
|
||||
# logic more easily on an emulator, so the decision to use the arm64
|
||||
# orderfile for x64 (instead of arm32) is somewhat arbitrary. We just
|
||||
# needed to use some real orderfile.
|
||||
|
||||
Reference in New Issue
Block a user