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