tree 29c21071ff3009a7dc7dd1a592ebf484080720de
parent a38af7e676a158cc57814a4f775cbb85d9e66269
parent bebd8b0b5403cd5bed36a3035b6c08429d01c444
author Patrick Rohr <prohr@google.com> 1649768224 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649768224 +0000

Merge changes Id92a2338,I38671aa2,Ic2df53f1 am: bebd8b0b54

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

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