commit | 4f5776811a525e4b3186cf5a47df491e9e34da78 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 03 02:04:29 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 03 02:04:29 2020 +0000 |
tree | 0fec9a452b38cb64137ea3df158983a3b8120803 | |
parent | c67060fdba1d3233caa96949d8bb23506f0fb9c0 [diff] | |
parent | 324a662a89a6fc70b3f63cfca2d8bd8327e6c50b [diff] |
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours am: 57a3f6e0af -s ours am: 324a662a89 -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: I488aaec3e0edf160d30063c20090d428a0128b68