tree 04204e3ba0ae463e78190df5b20fc15af99dc8a4
parent 15b6965d206ac2e33f76caa3b699e31776e5cf32
parent 34999d5d805bdded65186b25a501f3b3ede7039f
author Jimmy Chen <jimmycmchen@google.com> 1607360754 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607360754 +0000

[automerger skipped] P2P: Fix copying of secondary device types for P2P group client am: 22c30be53c -s ours am: 5844dcaebe -s ours am: 8c78ca6c81 -s ours am: 9578d67f15 -s ours am: 34999d5d80 -s ours

am skip reason: Change-Id I6837931dcd3be01e68dc93d79ec1f874063fcae3 with SHA-1 7382285854 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/13066760

Change-Id: I300603410e1fa35fd456b23fdaeeed2372f728c6