tree b3f797c48ba823f6130a7fb0657921ea3251167e
parent 4d44c36ed6e5f0409d37a327d4191040f28f89ab
parent bcd832e651b89e59fb4d61b3e4fea5ce4e9f759f
author Xin Li <delphij@google.com> 1639518659 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639518659 +0000

[automerger skipped] Merge "Merge Android 12 QPR1" am: 93c578c7ca -s ours am: 781839dd40 -s ours am: bcd832e651 -s ours

am skip reason: Merged-In I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1 with SHA-1 d109712194 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921898

Change-Id: I4de6426fbaed81d84fa27b9f5cc14371da0a7086