tree b8ccea77f7a790286982ed1a1bafd05f69995726
parent 89ba439bc81529ef9724133b0ff92cc97b2165a1
parent 7a5cc012fbb0d62ce93b3e684fec8480cfa170b8
author Karsten Tausche <karsten@fairphone.com> 1611133994 +0100
committer Karsten Tausche <karsten@fairphone.com> 1611133994 +0100

Merge the 2021-02-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  P2P: Fix copying of secondary device types for P2P group client

Change-Id: Ib3be600e4893361dd7114f50afff798cac0b3f26