diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2020-04-20 11:20:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-20 11:20:58 +0000 |
commit | 799a13b7791986045498f35c2b41192da5a1fe95 (patch) | |
tree | c9e142f76ac86a45a00bfb7df738d0edf981c371 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1771ba5cae09f3baa96622a192b2f69c3ca6f3be (diff) | |
parent | a3319d24a322cb6325399b012209bf0bcc32e197 (diff) |
Merge "Support learning the NAT64 prefix from two different sources." am: a3319d24a3
Change-Id: I8778773dab5f46aec6bf18c83d9766687307ca25
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions