tree 43a9a8f452130f780774e2e204a1f96cb3a5adcf
parent 33ee638bae19e615f85b8f6dd65b1c0aa40f8d2d
parent 68a007c616e73a2276f8ed0c07faa4a7c3648573
author Lorenzo Colitti <lorenzo@google.com> 1611115563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611115563 +0000

Merge changes Id87b88f6,I67dfba75 am: fab97c22b2 am: 68a007c616

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id99e7f262ceef003a2aff69ccaa0881ae1ca7918