Hugo Benichi d2348bc4d2 resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp ...

Conflits were:
  - static import section of ConnectivityService
  - code deleted in commit 94f0bfcda4

Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86

2017-04-20 22:26:50 +09:00

..

java/android/net

resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp

2017-04-20 22:26:50 +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