tree c7878f029d5a972bb4b81f7c5a84ac83d4537614
parent 2b047210ff5448ea4e2c04a0799f38deff2f09e3
parent 14f7c0273f4d5ecb26aa241a85b61bd2719b4d24
author Lorenzo Colitti <lorenzo@google.com> 1616476683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616476683 +0000

Merge "Have a new method in NetworkAgentConfig.Builder to set allowBypass" am: 14f7c0273f

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

Change-Id: I71d541b3578169410349356a149528954e1c8789