tree 63f2102eab67bd44abccdf764c26ae03eb87d49c
parent 75a9741c209fbdcf5af3260f1d8948ac340eaa79
parent e5a6619db956da54aa06f687b0cac7753bdeabf6
author Xiao Ma <xiaom@google.com> 1636711045 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636711045 +0000

Merge "Fix the probe wake lock duration when mcast_resolicit is enabled." am: e5a6619db9

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

Change-Id: Ic801105c0f3f4784c43054973baa6305c0402d5c