Automerger Merge Worker a223fbd6be Merge "Add list of Administrator UIDs to NetworkCapabilities." am: 452ccae317 am: 347f56c836 am: f11b5198ad ...

Change-Id: Idcd07e357703f7ae3f2c09de33b80b328e6bd384

2020-01-24 08:06:14 +00:00

..

common

Merge "Add list of Administrator UIDs to NetworkCapabilities." am: 452ccae317 am: 347f56c836 am: f11b5198ad

2020-01-24 08:06:14 +00:00

integration

Merge changes from topic "networkagent"

2020-01-22 05:27:51 +00:00

java

Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 6e1557d8ca am: 53133f708e

2020-01-24 07:59:53 +00:00

res/raw

NetworkStatsFactory: Take VPNs into account for network/battery stats

2019-06-14 11:41:31 -07:00

smoketest

Correct FrameworksNetTests-jni-defaults lib

2019-07-01 09:29:13 +00:00

Android.bp

[Tether07] Migrate Tethering into module

2019-11-30 10:03:08 +00:00

TEST_MAPPING

Add FrameworksNetIntegrationTests to postsubmit

2020-01-06 22:03:43 +09:00