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