tree 254b1968b095edbd3977f901b12164f058bba83b
parent c1ce10a64ea2da23f39187f738ea0e851cd70a44
parent 445dede4eb60cd8058927ad454dde5e693cde58a
author Patrick Rohr <prohr@google.com> 1643916899 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643916899 +0000

Merge changes I50417e69,I6892d81c,Id8846844,Ib22da8d4,Iad66f0d4 am: 445dede4eb

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

Change-Id: Idc9dc0f9edfaaa419ba00baca579f422bc2d2298