tree dabdd8b9f10cfb341f704d7893fc0edd0496076a
parent bb84cbd3e9989c4034c397288ee5c8a1ae891c8a
parent 754cda0caa04319543c1bca5af59ede8a83300bc
author Motomu Utsumi <motomuman@google.com> 1707915106 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707915106 +0000

[automerger skipped] Merge "Remove aconfig flags for Connectivity FlaggedAPI annotations" into main am: 754cda0caa -s ours

am skip reason: Merged-In Ie8e0f911d0f7d7e81d108b8e8ab539b29a255ad0 with SHA-1 1cd6cadb84 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2919289

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