OSDN Git Service

Merge "Captive portal: rotate fallback urls" into oc-dev
authorHugo Benichi <hugobenichi@google.com>
Fri, 14 Apr 2017 12:34:33 +0000 (12:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 12:34:33 +0000 (12:34 +0000)
commitaf18992066307c4090fcbac210cbecf3b33fccdf
tree98cdc2ceb5c1669c361ded833dcd274ba4e1a7be
parent27af670d9a0de6e63a42daf52fb522759ebd00e2
parenta622b24d3a28a59b67475e06b782c72ebb17c7dc
Merge "Captive portal: rotate fallback urls" into oc-dev
am: a622b24d3a  -s ours

Change-Id: I60f1cca6bb834f8f82dd0627c0943f5785a79122