| commit | 54347a850e805d73ba7279b1d000a77caa73f8ba | [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 | 0c8b432e10b81338361ec51d97074362898621ea | |
| parent | 8d12e479492e5c912ca038e8be3e494002630451 [diff] | |
| parent | e283f049b8e2752fa8a67f7bed4fdb1d4604ea1c [diff] |
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: a11688cabc -s ours am: e283f049b8 -s ours am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443 Change-Id: I8f5a2c331176a3e1a2c11aebe65a6a8799f309a2