tree 83e7c365e15f7469d2875181cfda98ce8d0d3d5a
parent 53fbc9d8c03a33d2f12eb2cf1663915778df47e7
parent 064d18d18828b0cb7b4447c7c6ad29329c6340bf
author Treehugger Robot <treehugger-gerrit@google.com> 1593737647 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593737647 +0000

Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887

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

Change-Id: I472fd717d82304e4362c3075805b460b02a197e0