diff options
| author | Maciej Żenczykowski <maze@google.com> | 2020-06-01 02:48:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 02:48:30 +0000 |
| commit | b74229b1b8dfeb521d935637d4739634ae827c01 (patch) | |
| tree | 91e22f10b1d8a7496f1d9f2e8318393a743864b7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 867179b566dd7c3144fb0119d91b8326697a270e (diff) | |
| parent | 53e23adc19eb51ae969da14b11377af7188c413e (diff) | |
[automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: fdcd562529 am: d8d0f5e5d6 -s ours am: 1a865c7622 -s ours am: 53e23adc19 -s ours
am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 141ec9686c is in history
Change-Id: I262105a96dbdf96a6fe9527f256f407b255d5560
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions