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)
commit645b48c8af7e2615177d71f92d82f580cc476351
tree850536e27beddd11315d0d0f65759b92264069bc
parentb96d428e40ad345e402673c9a98a59a91e48019c
parent8328f27a87577581be640f80918fe4c6251ac881
Merge "[CM] Allow timeout in request network"
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
api/test-current.txt
core/java/android/net/ConnectivityManager.java