commit 4c9cc198f0874d7c1058e84c80e40d99a59c5733
author Jihoon Kang <jihoonkang@google.com> Wed Oct 11 22:32:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 11 22:32:31 2023 +0000
tree 3b99c1ba9ca1a0d69e724a267ed8926c1358529d
parent 0bbd5408982f09c7e290a4aa528e1bb992ddca73
parent cdcabb3dc6f841eed7b179c76b2bdc69e5d60c9c

Merge "Prepare for keeping concrete overrides of abstract methods" into main am: dde1797b4a am: e49ecec3de am: 886f90f3f2 am: cdcabb3dc6

Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068

Change-Id: I270015864b7fa5c5982cbe8c4af0c15df2ec327f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9f1b879..a6f3a96 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1,4 +1,6 @@
 // Signature format: 2.0
+// - add-additional-overrides=no
+// - migrating=Migration in progress see b/299366704
 package android.net.compatibility {
 
   public class WebAddress {

api/removed.txt

diff --git a/api/removed.txt b/api/removed.txt
index d802177..14191eb 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -1 +1,3 @@
 // Signature format: 2.0
+// - add-additional-overrides=no
+// - migrating=Migration in progress see b/299366704