tree 6d6071b15f91d9350b9dbd9b3e5f67c9829c9221
parent 53300dce4cd680b48b8274ed57a58904d309d006
parent c1af699968678ad5e770dd0afea7e8bbd926a700
author Paul Hu <paulhu@google.com> 1557833315 -0700
committer android-build-merger <android-build-merger@google.com> 1557833315 -0700

Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" am: cfcbda3345 am: 9144bdf0e1
am: c1af699968

Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b