tree 4b98bb22d8190c2dd29f024d350e68cd25ef984a
parent 54651567a8db34be3b57a204e0dcb214549f13ee
parent 12eadd2133714819cc5868691dcd1fcaca3d9dad
author Chiachang Wang <chiachangwang@google.com> 1614131009 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614131009 +0000

Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic639b459a37a4dcb90a11a2df39455143316fb5d