diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-03 01:36:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 01:36:29 +0000 |
| commit | 073a58d001d32c54b8b703146b580e53b08563bd (patch) | |
| tree | a013a8a36da362ae4d90bc852561731879ff9224 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9dc45d4f114f34495fde9ffa16c6976eee32fa05 (diff) | |
| parent | 09a8b68f3e44e6fdd22fffeafd5b5a94a9a9f976 (diff) | |
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 09a8b68f3e -s ours
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions