tree 348c3ee7208c60fcda34dc12799a170d2e933df6
parent 537a788091d7a58da1da0c8a4e99cd215435b81c
parent 75faf02f04f328619870cbae7c97c9529f1c0f57
author Hugo Benichi <hugobenichi@google.com> 1496825503 +0000
committer android-build-merger <android-build-merger@google.com> 1496825503 +0000

Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
am: 75faf02f04

Change-Id: I1561ccd2676315f3110f20fcbfbd55453f92cbed