tree fa65e94bbb85cde459add3f207617b5d0116a40f
parent 259e42efc3ad6cb35c2562f40d77829d8b57c32f
parent 3938102448ee8990f62ac9c387ba8dc9afe6f2b7
author Nucca Chen <nuccachen@google.com> 1647023175 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647023175 +0000

Merge changes I5af6ce96,Ibc1f6813 am: 3938102448

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

Change-Id: Ib299b5e06a01435b7f7e36486346cd198a026b21