diff options
| author | Luke Huang <huangluke@google.com> | 2019-05-30 10:04:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-30 10:04:40 -0700 |
| commit | 3c403bba89122cc36308833b65193a9434a5d5b0 (patch) | |
| tree | ec89704359c3611234c7de8e8ec7e8f99560588f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e35a3277752b2d5a68efdaa2026e89c2ddae6108 (diff) | |
| parent | 6638d6ee75851e0ad52e4e9cc5dcb91d63f03800 (diff) | |
[automerger skipped] Merge "Merge "Fix issue for DnsResolver#query" into qt-dev am: 23d7a55d18 am: eba8c859a3" into qt-r1-dev-plus-aosp
am: 6638d6ee75 -s ours
am skip reason: change_id Ibb5080acd3c296650d56532fc7da525e9fa95e8f with SHA1 3854966dc9 is in history
Change-Id: Ib47ff2cace7d2c1a8baac653a4f480ecd074b8e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions