Jeff Sharkey 595987e619 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev am: f31cf45e82 ...

am: 8ab5f7f324

Change-Id: Ica24924ff8e5c95bd14114fb0a1d82c21a7d30d4

2017-08-30 19:27:49 +00:00

..

java

Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev am: f31cf45e82

2017-08-30 19:27:49 +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