diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2020-07-02 10:03:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 10:03:06 +0000 |
commit | 2e885e55de7ba62593c401efb23cc791044968b0 (patch) | |
tree | 753ee6a2b865bfdb3f5370d96f50cb1ce9e8de05 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | eb3069cddd2a8f484d8af45ce5904408b7c44aaa (diff) | |
parent | 240612eee4254d58bd1f48e5410ac1837ce54778 (diff) |
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: b903009741 -s ours am: 3fc2f61e2d -s ours am: 240612eee4 -s ours
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 eee629f4c7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I50f022d349da36cb90e1fa3fc250659511d42d04
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions