tree e8e76c4b923b41cf4be9d547abae65e7a1b55e8d
parent ea1a278478502774f01a4b05ebe9e1e557e7cc59
parent 10b113c62183d7103f154b2d968886ccd0c15325
author Benedict Wong <benedictwong@google.com> 1617412550 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617412550 +0000

Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 42d706acfc am: 10b113c621

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

Change-Id: Ib714d9a03e5b5152a576330711a8894178db4a95