Frank Li 41d65110f5 Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: 23d31b0274 am: 952d747c72 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2b32d56b4a00608b226c1d9b87b4e5b7818bd86

2021-02-16 04:13:05 +00:00

..

java

Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: 23d31b0274 am: 952d747c72

2021-02-16 04:13:05 +00:00

jni

Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec am: 6011d5240c am: f684b8d431

2021-02-16 02:24:39 +00:00

xsd

Merge "Persist compat framework overrides across reboot" am: 51164692d0 am: e153c16320 am: 40071fa8e8

2021-01-27 22:17:17 +00:00

Android.bp

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 45ec3191a7 am: 246444fef7 am: ed9730e6f9

2021-02-15 01:32:50 +00:00

OWNERS

…