Tobias Thierer 1f44659b2f Merge \"Changes for upgrade to OkHttp 2.7.5\" ...

am: 5c3bebd673

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280

2016-06-30 12:49:47 +00:00

..

java/android/net

Merge \"Changes for upgrade to OkHttp 2.7.5\"

2016-06-30 12:49:47 +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