| commit | 37219cfa5fe8315428e3d9c31ce5069fc4540aef | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 03 02:13:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 03 02:13:31 2020 +0000 |
| tree | 0c4844e14054066627deee6b6ce45db468ff4833 | |
| parent | 47305e5f833d150c01d667cd2d1e943d4e410627 [diff] | |
| parent | 4f5776811a525e4b3186cf5a47df491e9e34da78 [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: 4f5776811a -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: Ib4dbd5d52c01ef0dfe82dc7856ab2ee252b42b58