tree 06a92add7e97f8a483c55fed1e1ffaaefb6698d2
parent e8a3779d4d045bc6f57394c7f5eb7aa97fe6dfeb
parent fc04c3840f3910dede1470f7294c4c259c4f67f8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579884629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579884629 +0000

Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 5b8737d5d2 am: fc04c3840f

Change-Id: Iaa36b7036d916ef7a48314a3dfa224750e720c62