tree 01234c0ec1c44c9f4d130dd91038bbf377954619
parent 2fa14ae4c00a6473fbd3a1c9789925906ed6a515
parent 3c959339ae96e451b79dba918966f51a3f835d3a
author Remi NGUYEN VAN <reminv@google.com> 1553481992 -0700
committer android-build-merger <android-build-merger@google.com> 1553481992 -0700

Merge "Fix API in CaptivePortal and ConnectivityManager"
am: 3c959339ae

Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff