tree 0fec9a452b38cb64137ea3df158983a3b8120803
parent 4db7ca359f314e9dc8e591d6cb195de9f49c06ba
parent 0052646bd667750b04c89b383097e8e913397d9a
author Treehugger Robot <treehugger-gerrit@google.com> 1593740189 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593740189 +0000

[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours

am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history

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

Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f