Tobias Thierer 4b2e1aef96 Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: 5c3bebd673 am: 1f44659b2f ...

am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1

2016-06-30 13:04:52 +00:00

..

java/android/net

Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: 5c3bebd673 am: 1f44659b2f

2016-06-30 13:04:52 +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