diff options
author | Chalard Jean <jchalard@google.com> | 2018-05-01 02:25:50 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-01 02:25:50 -0700 |
commit | 8830d5218ead9a7aa240a03f21aadb5baae0ab1d (patch) | |
tree | b2aa4f41e7556c107518537e9cb3220b8d8b4f16 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9361cc11ddbbcbc146bcb48499eb5fe5298c40d0 (diff) | |
parent | d085018e0997044e32b5378e03fc17f7c902cc6e (diff) |
[automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 59e139a767 am: ce9434a9a2 -s ours
am: d085018e09 -s ours
Change-Id: Id29fb6d0e81e0539f59652f203f0cffc973b2e1d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions