tree 146e72a527fcad428f1e3a2845ae9d6de8153936
parent c9bee74abdae530b17a63ea934a007ba0e82c80c
parent fd710547b28ae2c941773325a40ef1f9b96c1047
author Lorenzo Colitti <lorenzo@google.com> 1613107021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613107021 +0000

Merge changes I71a37663,Ib2010b38 am: fd710547b2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefd7946816067ed9279f26e48d86934db54056ce