tree fb1320bec3ded6d2f373570b5d8cfe44cef4f232
parent 20ab1f22c6bc54e40d088db71551f722103ed226
parent c11a8b71db7403d3a1eec77272e450be4747bb0b
author TreeHugger Robot <treehugger-gerrit@google.com> 1599704158 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599704158 +0000

[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: 19c2f87399 -s ours am: e89b23d367 -s ours am: 1b3765d00c -s ours am: 1110c6dced -s ours am: c11a8b71db -s ours

am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 d98eeda694 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905

Change-Id: I56eeb269b9347b3cb96418b49a020c25980fe47a