Lorenzo Colitti cca30a72ac Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205 ...

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

Change-Id: I512785d414fcfd4819cdf26ff3c3403c049db475

2021-03-18 18:25:54 +00:00

..

common

Merge "Replace InetAddress#parseNumericAddress"

2021-03-15 07:03:46 +00:00

integration

Set extraInfo on cellular TestNetworkAgents.

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

java

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205

2021-03-18 18:25:54 +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"

2021-03-16 02:29:31 +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