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