tree 1ddb5e6d06841619ca150ef7ed9aa1f79de3dafb
parent 89d60ad686c789ed217b6ca88540d7c1383b9cea
parent 004f473e9794015d69b0ff2b339d6927f46f480a
author Treehugger Robot <treehugger-gerrit@google.com> 1601873185 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601873185 +0000

Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97

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

Change-Id: I70b49d0a10b80f378dcd2ba78b5bac848e40e5c9