Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b am: f674528970
am: 22f7e75f67

Change-Id: Ibfba10cb92e63a7ae727f48543da040aa5f39116
tree: de5046eb03ea74e951258382a457654643257cd0
  1. core/
  2. services/
  3. tests/