tree e0bdc2a9b504a17c8ad093a9664a49a26efc45da
parent c041940b5c9a824f8c6516334eb22748975f42f6
parent 455ef41ef5c06bffbda95b4d8dcbd7227cd8275d
author Treehugger Robot <treehugger-gerrit@google.com> 1619106913 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619106913 +0000

Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 455ef41ef5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: I1e5d2eafc493b165cb816ccdd6f1b9bb733a3aa3