tree 7bff4e8a02b8cdbeb6eef163f8bfee161a0b8ac9
parent 342ea45a67306de74d5533177863c3d78bd772b1
parent ed86e4622d6d30025ff4460d9b8336bd7054575b
author Cody Kesting <ckesting@google.com> 1590818089 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590818089 +0000

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

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

Change-Id: I3dfa94942def03f7a9cd081a8f0b31fdb9ac97c5