[automerger skipped] Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f am: 72dad8bc9d am: 76190cf069 -s ours am: 84429456eb -s ours

am skip reason: Change-Id I931aabaada09c87b4a7936bcde4fcff8bc237dd0 with SHA-1 8881f91349 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0703cb7f83323a9b9ce90d3ccfd0b8851a22cb62
This commit is contained in:
Alex Salo
2021-02-05 02:48:28 +00:00
committed by Automerger Merge Worker

Diff Content Not Available