tree c6bae97c6f82b812019d8b9fa8ba01f72c117e1a
parent 42586fa3dc049e0fec636adc6fa6725534b6d089
parent da5e11c95fd75349c036a17dd0804bc337326dc3
author Treehugger Robot <treehugger-gerrit@google.com> 1645704880 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645704880 +0000

Merge "Fix a flake where network caps change innocuously." am: da5e11c95f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1984746

Change-Id: I92452b90c8b11ac014657f8cfcf417febf36c840