Jeff Sharkey 00faf37463 resolve merge conflicts of d1153a3 to master ...

Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267

2016-04-25 16:40:38 -06:00

..

java/android/net

resolve merge conflicts of d1153a3 to master

2016-04-25 16:40:38 -06:00

jni

Remove framework code that calls SIOCKILLADDR

2016-03-22 12:54:32 +09:00

tests/coretests

NetworkStats.Bucket API polish.

2016-03-14 11:24:12 -07:00