tree 380cbc0daac47ff7ea48a6463be8afd272ca8788
parent 28061cd1dd1c3153ff96e40f13c23118cd598acd
parent 4c06947fcea2dc9eac8ad2840675abed6b9f07ab
author Jean Chalard <jchalard@google.com> 1639483408 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639483408 +0000

Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 am: d5c9c3f4ae am: ad1cd95c10 am: 4c06947fce

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

Change-Id: I0ec0ae63a8d1d65f1f51ca1cc9a1d4cbb578cbcd