tree d3313496833366fe0d4a1615714cf20fe0e4603b
parent cef564eb4f5f7a0a6432b7cd3c1f57eaf8bee53b
parent 5469fa6e5902010164caafeea044e365edb94a1e
author Jean Chalard <jchalard@google.com> 1639480497 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639480497 +0000

Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59

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

Change-Id: I4b385d93b24ea85240dde589b2357543fb80c122