OSDN Git Service

Merge changes I4d2be5d9,I34706201 into oc-dr1-dev
authorHugo Benichi <hugobenichi@google.com>
Tue, 20 Jun 2017 08:38:27 +0000 (08:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Jun 2017 08:38:33 +0000 (08:38 +0000)
* changes:
  Better errors from unregisterNetworkCallback
  CaptivePortalLogin correctly unregisters callbacks


Trivial merge