Lorenzo Colitti d14c177136 Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf am: 0cf31d4d6d ...

am: 20fa45e3a9

Change-Id: I5d700c9818a89ba3eaab8a34bb799ae7145dbd28

2017-08-15 02:34:30 +00:00

..

java

Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf am: 0cf31d4d6d

2017-08-15 02:34:30 +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

DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies

2017-08-08 16:06:54 +09:00

AndroidManifest.xml

Unify permissions under UPDATE_DEVICE_STATS.

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

AndroidTest.xml

Change test type from InstrumentationTest to AndroidJUnitTest

2017-03-31 16:02:33 -07:00

OWNERS

Connectivity OWNERS: let owners modify Android.mk

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