Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev

am: 5625d486b9

Change-Id: Iaec556477328fdf5e5f304a456c8942bca11592a
This commit is contained in:
Lorenzo Colitti
2016-12-14 04:59:54 +00:00
committed by android-build-merger

Diff Content Not Available