tree 26cbddebc4e0fb6d32392a2a08befe71d3372111
parent 0c9b5deec660e901653369ce00b3abd5113bbd83
parent e1c17cbb6648e049062ae1864b3bebf2876a0c65
author Wayne Ma <waynema@google.com> 1620628118 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620628118 +0000

Merge "Add PRODO_DOH in enum Protocol." am: 05bf348e44 am: 474f5aea0a am: e1c17cbb66

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1696986

Change-Id: I5837fa269865b41095fa075be51c344831649941