tree e709259a4bdaead75d2d24d3f97e1aa068847367
parent 46f4f4c8753c29ee64ed720d9c01155ce9254b1e
parent 3d0785ba40b8298722486fd38f233ca41ead110c
author Hai Shalom <haishalom@google.com> 1596220270 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596220270 +0000

[automerger skipped] [Passpoint] Remove R2 broadcasts am: bfaadd48df -s ours am: 99f9651d10 -s ours am: 9c389c97b8 -s ours am: c0595553b6 -s ours am: 3d0785ba40 -s ours

am skip reason: Change-Id I25aba4c7a39150e9df483890f575d3e3767723be with SHA-1 e66106d77e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11959862

Change-Id: I86b75d579d5de456755016cdd6e0db8653b7e130