Automerger Merge Worker fbcdf41d67 Merge changes from topic "settings-vpn" am: 70f90282ef am: 1758c298d0 am: 3d6f91ed37 ...

Change-Id: Idac6e83bab50b818e2776f28da380f08000e2a42

2020-02-19 23:08:32 +00:00

..

common

Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 50e2cbde28

2020-02-14 13:51:45 +00:00

integration

Add public fields to NetworkScore and make it @SystemApi

2020-01-30 18:45:52 +09:00

java

Merge changes from topic "settings-vpn" am: 70f90282ef am: 1758c298d0 am: 3d6f91ed37

2020-02-19 23:08:32 +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

rm libbinderthreadstate

2020-02-06 13:23:47 -08:00

TEST_MAPPING

Add tests to services/tests/net test mapping

2020-01-17 11:38:29 +09:00