Android Build Merger (Role) 9a13a242bc Merge "Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp am: 4351aecb2d"

2017-08-16 19:28:20 +00:00

..

java

Merge "Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp am: 4351aecb2d"

2017-08-16 19:28:20 +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