Junyu Lai 1931a31772 Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500 am: ed8aca675d ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3db655c53a855fe418ba5c6fd8230622805966d5

2021-03-12 09:07:00 +00:00

..

common

[VCN04] Add Subscription Id set into NetworkCapabilities

2021-03-11 23:03:05 +08:00

integration

Set extraInfo on cellular TestNetworkAgents.

2021-03-10 23:33:08 +09:00

java

Merge "ConnectivityManager: Provide API's to include location sensitive info" am: f72f1d9e28 am: 312bcb6871 am: 6519ca6217

2021-03-12 07:12:03 +00:00

res/raw

NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID

2020-05-28 02:44:20 -07:00

smoketest

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

Android.bp

Merge "Create ServiceConnectivityResources" into sc-dev

2021-03-12 02:10:20 +00:00

jarjar-rules.txt

Address comments on aosp/1448415

2020-10-21 13:54:02 +09:00

TEST_MAPPING

frameworks: add test group for auto tests

2021-03-09 15:54:39 -08:00