Hugo Benichi a428392c1d 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

Android.mk

Remove INetd AIDL reference

2016-08-30 11:40:20 +09:00

OWNERS

Add first OWNERS files for core networking

2017-07-12 09:25:15 +09:00