tree 11c99171d654c97f58a701af1841e244aca4c445
parent b9ee56788156c5963796ae0ad0e53b6674ef0ffb
parent 0470353c2e5c827d47ff4dce0a13744d7e429320
author Remi NGUYEN VAN <reminv@google.com> 1554279698 -0700
committer android-build-merger <android-build-merger@google.com> 1554279698 -0700

Merge "Fix API in CaptivePortal, StaticIpConfiguration"
am: 0470353c2e

Change-Id: Ia36ba5946e8dc956c5c71cbebe7dc02658fdb7a0