tree ec3c8b48456944ff5cd29254503a3296b1d86d54
parent 2270e98802542455c8d9d1cc817cdabf9e1c7019
parent 9bdd98e71dfaa3f8a2e0eb674c85ab193af08b05
author Remi NGUYEN VAN <reminv@google.com> 1616122378 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616122378 +0000

Merge "Add InetAddressCompat" am: e1da163302 am: 2aec625379 am: 9bdd98e71d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I90dba64e96080cbd29f538de6dcb514dea4b6cbd