Lorenzo Colitti a01e12bd39 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp ...

Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91

2017-04-14 11:37:12 +09:00

..

java/android/net

resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp

2017-04-14 11:37:12 +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

Merge "Move some NetworkStats tests to tests/net." am: 92e3d4f7c3 am: 67401e25c2

2017-04-13 05:48:37 +00:00