Erik Kline b228a30b39 Merge "Support NAT keepalives" into oc-mr1-dev am: 4fae111ca2 ...

am: a0991bdc14

Change-Id: I4d180369a8f64ee494b016656988252d98a09ba4

2017-09-07 21:42:58 +00:00

..

java

Merge "Support NAT keepalives" into oc-mr1-dev am: 4fae111ca2

2017-09-07 21:42:58 +00:00

jni

Merge "frameworks/base: use proper nativehelper headers"

2017-07-20 02:50:53 +00:00

res/raw

Finish moving NetworkStats tests to tests/net

2017-05-17 22:24:05 +09:00

Android.mk

Fix some broken tests in frameworks-net with native dependencies

2017-09-04 11:03:55 +09:00

AndroidManifest.xml

Unify permissions under UPDATE_DEVICE_STATS.

2017-07-17 16:10:55 -06:00

AndroidTest.xml

…

OWNERS

Connectivity OWNERS: let owners modify Android.mk

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