tree fdc1aa9fee7c7260bea9cb92672bb5471268ecc3
parent f94fb42850b188418c1c58e043a08a68868989e6
parent 680cce79b92f8d2ad9205968a4b3103e0e22cd98
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579883987 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579883987 +0000

Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 680cce79b9

Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78