tree 3c95e974a5621f6af4ebee80d29ecaa58127967c
parent 24f953a6c21c6cfde196cbb0a60cd3a191998cdf
parent e34896af249ffc116b18e1ceddb9658473fc6a8f
author Chiachang Wang <chiachangwang@google.com> 1551112432 -0800
committer android-build-merger <android-build-merger@google.com> 1551112432 -0800

Merge "Fix build warnings for CaptivePortalLogin" am: fc0708615c
am: e34896af24

Change-Id: Id5ae42f19bb947aea1835dac460b030fad979422