tree ebf75f3d6fd606c069a71957891d9595c39e054b
parent b4525057e58569cd6924bcbc04680c114b6894f1
parent 2aec625379982d928d53cca7904a02f178224234
author Remi NGUYEN VAN <reminv@google.com> 1616116206 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616116206 +0000

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

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

Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1