Jeff Sharkey 8ab5f7f324 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev ...

am: f31cf45e82

Change-Id: Ia6c6d5893d841f21d181363dc01f77efa6579a8f

2017-08-30 19:14:21 +00:00

..

java

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

2017-08-30 19:14:21 +00:00

jni

Merge "frameworks/base: use proper nativehelper headers"

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

res/raw

…

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

…

OWNERS

Connectivity OWNERS: let owners modify Android.mk

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