Erik Kline a0991bdc14 Merge "Support NAT keepalives" into oc-mr1-dev ...

am: 4fae111ca2

Change-Id: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde

2017-09-07 16:48:57 +00:00

..

java/android/net

Merge "Support NAT keepalives" into oc-mr1-dev

2017-09-07 16:48:57 +00:00

Android.mk

Remove INetd AIDL reference

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

OWNERS

Connectivity OWNERS: let owners modify Android.mk

2017-08-08 10:46:57 +09:00