commit | e46a929b7454efefd3ffcfa26c1f5f1bbd57be06 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 19 02:00:29 2022 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Aug 19 02:00:29 2022 +0000 |
tree | 1ef948b56d9229e207ecf221d4fa114726e49a5f | |
parent | 35575914bc8caf1a7ee9ff889b420342efa366ad [diff] | |
parent | bbb9611eaf02b24483416c243505ec2c92ea6648 [diff] |
Merge changes from topic "am-fa33a383ff0f4e08be1cb49d59f1732d" into android12-tests-dev * changes: [automerger skipped] Merge "[RESTRICT AUTOMERGE] p2p: make first connection state check more robust" into android11-tests-dev am: ed6917d848 -s ours [automerger skipped] [RESTRICT AUTOMERGE] p2p: make first connection state check more robust am: cf3a980fa2 -s ours