diff options
| author | Jihoon Kang <jihoonkang@google.com> | 2023-10-12 00:07:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-12 00:07:45 +0000 |
| commit | 9f7472c69279d111f344974bdbe44955d01d3e66 (patch) | |
| tree | 3b99c1ba9ca1a0d69e724a267ed8926c1358529d | |
| parent | 0bbd5408982f09c7e290a4aa528e1bb992ddca73 (diff) | |
| parent | 4c9cc198f0874d7c1058e84c80e40d99a59c5733 (diff) | |
| download | apache-http-9f7472c69279d111f344974bdbe44955d01d3e66.tar.gz | |
Merge "Prepare for keeping concrete overrides of abstract methods" into main am: dde1797b4a am: e49ecec3de am: 886f90f3f2 am: cdcabb3dc6 am: 4c9cc198f0
Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068
Change-Id: Id04db5d4064b87c1573aecf4bbb08ac4a54ae3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/removed.txt | 2 |
2 files changed, 4 insertions, 0 deletions
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 { 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 |