tree ef66970e1034d76069c3f17ac2e0f357a7f633ef
parent 9387c687deddebeab4cd2e10153c37fcbcc0d5f5
parent 345de7f775038c656b54e0a7a1c9ed3e75807d07
author Xin Li <delphij@google.com> 1640072196 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640072196 +0000

[automerger skipped] Merge SP1A.211205.008 am: 96dccee28a am: cad26795d1 -s ours am: 345de7f775 -s ours

am skip reason: Merged-In Ie8480c46c91ffa756edb2c85fc565d2e1d1504a5 with SHA-1 f87b20864d is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/1930745

Change-Id: Id5af58049f7e3b01cc39be9b1e9ded9b36ecb075