OSDN Git Service

Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
authorHugo Benichi <hugobenichi@google.com>
Sun, 15 Oct 2017 02:24:52 +0000 (02:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 15 Oct 2017 02:24:52 +0000 (02:24 +0000)
am: d098328585

Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62


Trivial merge