tree a838c0e8eefaed51aa0873df7fe0c11034dd538d
parent f0e1e01c44c25e152662dfd1f19bc35b5091bb36
parent c88ca67bb34b9b504c48d18a14e3c0727bf1d15e
author Lorenzo Colitti <lorenzo@google.com> 1521481174 +0000
committer android-build-merger <android-build-merger@google.com> 1521481174 +0000

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

Change-Id: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb