tree e565aab0ca203485443c43172ef53692501936f7
parent 4ff8cf639109a8049548985b5c94ed815bf3968e
parent b9dda055a57f493c6d84ce0ec937c3231327d081
author Treehugger Robot <treehugger-gerrit@google.com> 1613539387 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613539387 +0000

Merge "Adding per-app default network callbacks support" am: b7adcd0e6e am: b9dda055a5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaaf1ceea1e085f84d4114f99aa582e406dd631ae