Hugo Benichi df167a5d02 resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031

2017-07-14 07:25:51 +09:00

..

java/android/net

resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master

2017-07-14 07:25:51 +09:00

jni

Have IpManager track L2-L4 signaling traffic required for IP connectivity.

2016-12-15 10:13:36 +00:00

tests/coretests/src/android/net

Move some NetworkStats tests to tests/net.

2017-05-08 08:38:08 +00:00