tree 7145f5ad70725fe5e6ad218fbce2a52585a3f023
parent 1e7b9bca3df0803c77e496694c659f73bf061d40
parent 2be66008a01c93eb1db193c6af104a2e676fd643
author Lorenzo Colitti <lorenzo@google.com> 1607928027 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607928027 +0000

Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7 am: 2be66008a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4e4d7b6d607d6c9f6efc2d06732f7826f7942e