tree 7bff4e8a02b8cdbeb6eef163f8bfee161a0b8ac9
parent 222aec4928facc88f71ee2b32796ffbd0a50ba96
parent c48967760c0b7e9ce8f5cf171145ee466abf0351
author Cody Kesting <ckesting@google.com> 1590819597 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590819597 +0000

[automerger skipped] Merge "Add CTS testing for ConnectivityDiagnostics Data Stall callback." into rvc-dev am: 9ce134cf40 -s ours am: 9b37497626 -s ours am: c48967760c -s ours

am skip reason: Change-Id If6ceae9d2bbcabf88298d2d8c39cad5275fbd1ef with SHA-1 d1e42d7e64 is in history

Change-Id: I2a533fcaaf965014494a8e2ad1b27ba79b2e6a06