tree 0757715c892f88a0861a4fbd9490e34cd18b150a
parent 0928dbc31bd4f39f06c4ba75985d127494c00fd9
parent 6de87582c13a57e1b0cc9cfc7c12335e1e7d5238
author Lorenzo Colitti <lorenzo@google.com> 1648851312 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648851312 +0000

Merge changes from topic "block_port" am: 6de87582c1

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

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