tree 0f5bf40c468ad7ddbb6e62f95e2d177ac2b38d21
parent a323e040ef80906ea459580c52fa7fddef011aaf
parent 0a3ad27abb53b718404abf9fef5efde43e7c08d3
author James Mattis <jmattis@google.com> 1612331203 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612331203 +0000

Merge "Adding support for multiple "default" networks" am: 8bb0310bbe am: 0a3ad27abb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic28670aa18dcdd88016733f6b258d4d19a3f358e