diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-03 02:04:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 02:04:29 +0000 |
| commit | f6fbae6b13177c2f331b28f5dd9663552ea38a21 (patch) | |
| tree | d14856ea67b5a53178e939721b7afa10bc4ab1f9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 88c566209d7a74c08553ec0910c1d572a1f04632 (diff) | |
| parent | 29cd04ede0313020571794f3b1d9bd047d4bd5e7 (diff) | |
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 09a8b68f3e -s ours am: 073a58d001 -s ours am: 29cd04ede0 -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: I488aaec3e0edf160d30063c20090d428a0128b68
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions