tree 2cf3bad2bb5572c6223a19192561cf50b6793838
parent 5fc493d243f604bd6b6691e8c19e8383c60acc75
parent 43e624246bd7a09e6ac8612ca192c3dbeaa7c00b
author Baligh Uddin <baligh@google.com> 1604634477 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604634477 +0000

[automerger skipped] Merge history of CTS am: 43e624246b -s ours

am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 1711a1222c is in history

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

Change-Id: If81ced42e55230b210d42238ce244e6f1620dc07