tree fd29ca2dabb572e38779608c303d816483e82bd1
parent 4178cb45dd4a3493aae625b0e788d4c970150f69
parent 1fc4fa89eac647e73f9c42047a21c6a4f9a0ea74
author Xin Li <delphij@google.com> 1633679825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679825 +0000

[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -s ours

am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history

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

Change-Id: I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8