Merge "Fix API in CaptivePortal, StaticIpConfiguration"
am: cf0f380f4e

Change-Id: Ia36ba5946e8dc956c5c71cbebe7dc02658fdb7a0
tree: 255c5f2752d9fb48fd11a68c551271171f27e29f
  1. core/
  2. services/
  3. tests/