Chalard Jean 4896785b0b Merge changes Ia43f8811,I7de4f672 ...

am: 3ef04b8e3c

Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8

2019-07-09 00:56:57 -07:00

..

common

Factorize custom asserts.

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

java

Merge changes Ia43f8811,I7de4f672

2019-07-09 00:56:57 -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