Updated patches from Chromium 87.0.4259.3 to Chromium 87.0.4263.3.
This CL touches only those patches which updated cleanly, conflicts resolution to be handled in a follow-up patch.
This commit is contained in:
committed by
mkarolin
parent
4aa6f1c4af
commit
d2faa51130
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
index 7677b522a011df999cc610b870d77fa29282f670..1dcce1504b39f87dd51a7986c32b48b1d3f0ea24 100644
|
||||
index 3b1a51fe42f01e1c4d0c9b018c283675c2703106..bf977767a3f2d88099ce388332d836652945a297 100644
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -34,7 +34,9 @@ by a child template that "extends" this file.
|
||||
@@ -62,7 +62,7 @@ index 7677b522a011df999cc610b870d77fa29282f670..1dcce1504b39f87dd51a7986c32b48b1
|
||||
{% endif %}
|
||||
|
||||
<!-- Cast support -->
|
||||
@@ -1198,6 +1210,7 @@ by a child template that "extends" this file.
|
||||
@@ -1203,6 +1215,7 @@ by a child template that "extends" this file.
|
||||
</activity>
|
||||
{% endif %}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user