Hugo Benichi 4f03ac8b93 Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: cde023a3ea ...

am: e7b50f9ed8

Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935

2016-07-07 09:45:36 +00:00

..

java/android/net

Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: cde023a3ea

2016-07-07 09:45:36 +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