OSDN Git Service

Merge "Captive portals: reinspect http result after fallback probe" into oc-dev am...
authorHugo Benichi <hugobenichi@google.com>
Thu, 18 May 2017 06:02:13 +0000 (06:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 06:02:13 +0000 (06:02 +0000)
commit297e85e9ddc48ba5fda5e38aafa4c6214e3e2f4c
tree1770f73df41edfb9786489aa527e4bef9d1d321e
parent07ce85455f41ba2d81c61453b47505558c59f5d9
parent5bda8323c522a51278935f3eda25ebe9ee00308a
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev am: 1fe60b213e  -s ours
am: 5bda8323c5  -s ours

Change-Id: If6a502bc0f9b63a0bf7431a5a08f1f476a1640b7