diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2018-05-24 22:53:53 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-24 22:53:53 -0700 |
commit | bd531604e0870187f866d7d176538bfda0ca34f9 (patch) | |
tree | b9752d62fe73f6f8548b03f1cf229fe22a659209 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4300e8e2ba05c4cbdb7fa1b6f65364467365e279 (diff) | |
parent | aa6ddd668558e23b5ab761653cdbee3e3af9a165 (diff) |
[automerger skipped] Merge "Use AI_ADDRCONFIG for most DNS requests" am: b19a838f47
am: aa6ddd6685 -s ours
Change-Id: Ie19e3ef1c704f9318f067c03ccc75fdf6727fa89
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions