| commit | abe54fb52fdfffce7acd8813b572cab7aff02909 | [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 | c067ecc0c93d71cf83cf04428cd76d4ad5e1476b | |
| parent | b3ca3af496e2517912b1db2821d659000458b2b9 [diff] | |
| parent | 02a24103409ee326f0030bfc70d39276921b510a [diff] |
[automerger skipped] Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: 4423b79af3 am: 02a2410340 -s ours am skip reason: Change-Id Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a with SHA-1 2d0874ca05 is in history Change-Id: I47d76b218e21deedc9425938cc20cc2d30fbbab6