Lorenzo Colitti 9d1139ee06 Merge changes from topic \'networkrequest_private\' into nyc-mr1-dev ...

am: 0317e03dc3

Change-Id: Ia063c378bd32fdb056c0ecdc0f721d32e9fa49af

2016-07-01 15:20:21 +00:00

..

java/android/net

Merge changes from topic \'networkrequest_private\' into nyc-mr1-dev

2016-07-01 15:20:21 +00:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

tests/coretests

NetworkStats.Bucket API polish.

2016-03-14 11:24:12 -07:00