Fedor Kudasov 8125047183 Merge changes from topic "fix_master_build" ...

am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b

2019-07-09 06:10:01 -07:00

..

common

Factorize custom asserts.

2019-06-20 16:24:25 +09:00

deflake

Add FrameworksNetDeflakeTest

2019-06-07 17:35:17 +09:00

java

Merge changes from topic "fix_master_build"

2019-07-09 06:10:01 -07:00

jni

Move NetworkStatsFactory into service directory

2019-04-03 14:28:41 -07: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

Correct FrameworksNetTests-jni-defaults lib

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

AndroidManifest.xml

…

AndroidTest.xml

…

OWNERS

…