OSDN Git Service

Merge "Captive portal: rotate fallback urls" into oc-dev am: a622b24d3a -s ours
authorHugo Benichi <hugobenichi@google.com>
Fri, 14 Apr 2017 18:07:43 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 18:07:43 +0000 (18:07 +0000)
commit752fa520d732dac0f4f9c6bbee468b1a612b8321
tree84fdab456dea35762db0c7320105cd20e036cbe2
parentb4c52d616c9050c63ee4204dd4baeed4bdd2011d
parentaf18992066307c4090fcbac210cbecf3b33fccdf
Merge "Captive portal: rotate fallback urls" into oc-dev am: a622b24d3a  -s ours
am: af18992066  -s ours

Change-Id: I86641338b2551a9b0136704dcfeed6327c639407