tree 789a47602c2b0afbe751cee58dc3bc9b7a6cc16b
parent d9f603eebf01ab3bdd76a343f8e689b889ef3068
parent 57f9551d85e2b31794c394f18cea84cf8243fa5f
author Lorenzo Colitti <lorenzo@google.com> 1606477279 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606477279 +0000

Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d am: 7b4b6f40a8 am: 57f9551d85

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

Change-Id: I42147c28498b4a5e92102ad08a0725fc012bd8d0