tree 6ec637bc76e0654e1f679d5552fccb1fc40da3fb
parent fb1be39619489cea0301f2bc5da747b0306a4234
parent 834e5611bcc5455de3b107d699d631cb4e134dd0
author Patrick Rohr <prohr@google.com> 1646818738 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646818738 +0000

Merge "Allowing for null net caps in updateConfiguration" am: adec6f861f am: 834e5611bc

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

Change-Id: I1b1dcce340ff39a3eeb4359bad23510f3d2e7667