tree e0bdc2a9b504a17c8ad093a9664a49a26efc45da
parent a2755fbae3273edfe666950177bf4ffa3067b613
parent 367e8bdc7540a0e6fae87a21d5b296c46910cd16
author Treehugger Robot <treehugger-gerrit@google.com> 1619106856 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619106856 +0000

Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 367e8bdc75

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

Change-Id: I0b12536f2247c8d360506a6cae3891148a1a5197