OSDN Git Service

Merge "[CM] Allow timeout in request network"
authorEtan Cohen <etancohen@google.com>
Tue, 7 Mar 2017 16:49:53 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Mar 2017 16:49:53 +0000 (16:49 +0000)
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0

1  2 
api/test-current.txt
core/java/android/net/ConnectivityManager.java

Simple merge