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

am: 4fae111ca2

Change-Id: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde

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

..

android/net

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

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

com/android

Merge "Always add local subnet routes to the interface's routing table" am: 981228be38 am: 5fb26a1270

2017-09-07 12:55:58 +00:00