tree 5ef02b67062a9ace9741c398f5c43dbb4916c921
parent 4299728507a67107ce4fb7ecc0939dfd89bbd80a
parent 5343a0d79c45cc2981175ddca690e35c07fff619
author Xin Li <delphij@google.com> 1696585846 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696585846 +0000

[automerger skipped] Merge Android 14 am: 299f2ecf1d -s ours am: da35222766 -s ours am: 5343a0d79c -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: I79aa53dcbfcab7747164276092328c116100c609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>