Commit f258c783 authored by Ben Schwartz's avatar Ben Schwartz Committed by android-build-merger
Browse files

Merge "Pad queries when EDNS0 is enabled." am: 47a2f48d 

am: a66b63e4

Change-Id: Ie5439b0ad505ebf393a83c87845fd02549afc4a2
parents 153e839a a66b63e4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment