tree 5ef02b67062a9ace9741c398f5c43dbb4916c921
parent f98bb5a8e2a3001a57add8d25933bd56cb8f3e72
parent 299f2ecf1d1db75cef2ae3607f0cae7bd1202fdf
author Xin Li <delphij@google.com> 1696578725 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696578725 +0000

[automerger skipped] Merge Android 14 am: 299f2ecf1d -s ours

am skip reason: Merged-In I22b1d636f2c5209c9bc996d758331a43c3b8133a with SHA-1 8551d6a0d7 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2777227

Change-Id: I9363fb7115ab100666d808f3b4e994db71c3263b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>