tree 3d6695a9d3390e8736980d069c55ce027e097639
parent 5854b40065de5be82559991eb914637687cffa07
parent 8f9cfde3d8b626d0d19957759c565aaedcdc1395
author Maciej Żenczykowski <maze@google.com> 1642113500 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642113500 +0000

Merge changes I41dcf8aa,Ie13e1df6 am: 8f9cfde3d8

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

Change-Id: I66e4e1c5fd3d7042baefbcb328d008fdaf8c8443