| commit | 1a865c7622fc961b141977dcfc34dc23a4b382e2 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Mon Jun 01 02:23:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 01 02:23:53 2020 +0000 |
| tree | 09f39cfde2413bb518a17fc9a4c8967c885b1066 | |
| parent | 28bbd2256b65dd2cef9adde662618ea3cbce06dc [diff] | |
| parent | d8d0f5e5d66d20fd76d197b6d4fd128f63dd97a9 [diff] |
[automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: fdcd562529 am: d8d0f5e5d6 -s ours am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 141ec9686c is in history Change-Id: I47d76b218e21deedc9425938cc20cc2d30fbbab6