tree ef9dddd08a341fe396ccc344fe9e530166f29ac9
parent 59ecc20061c4465b43773b380b83a80e8834c95b
parent e74700dd5d5084e208d0b723cda3a4409cb011a9
author Lorenzo Colitti <lorenzo@google.com> 1606473882 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606473882 +0000

Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d

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

Change-Id: I480d4d7cea8d6009ef71e0bf30f6d7a18dd99783