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