tree 8da906654fd259a38975aac7161cc370181dfded
parent 660c46db410605f938c7bba5e4e3a8b5b4a63284
parent 617f6159db19001c43831142de4ab51e3f222f6a
author Lorenzo Colitti <lorenzo@google.com> 1521482130 +0000
committer android-build-merger <android-build-merger@google.com> 1521482130 +0000

Merge "Enable cleartext for captive portal apps" into pi-dev am: c88ca67bb3
am: 617f6159db

Change-Id: I742bf6be74a9e6953d0a779bdab0c25cf32aa740