tree 7bff4e8a02b8cdbeb6eef163f8bfee161a0b8ac9
parent 88de77f77f767ea9ce386f23c0d73046e615484b
parent 53fc8b08d9112e279ff6f60ce177c7d4c444af5b
author Cody Kesting <ckesting@google.com> 1590819586 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590819586 +0000

[automerger skipped] Merge "Add CTS tests for ConnectivityDiagnostics callbacks." into rvc-dev am: ed86e4622d -s ours am: 97ef6954a4 -s ours am: 53fc8b08d9 -s ours

am skip reason: Change-Id I748229d41c16adf1561e03aa597d5aac00f12912 with SHA-1 caf797ef34 is in history

Change-Id: Ie73a85e8c32ba82a076787c64d2f7c4304d88c2a