tree f4717ec8447d602fed32676fe59013f0c83f4a25
parent 96050beab054f5caaadb93fb97e09f264f792093
parent 18da5d7e1e11b615ff261041406d19f0a4256585
author Frank Li <lifr@google.com> 1564116594 -0700
committer android-build-merger <android-build-merger@google.com> 1564116594 -0700

Merge "[automerger skipped] Merge changes from topic "DNS telemetry" into qt-r1-dev am: 412c59128e -s ours am: e22c237438 -s ours
am: 18da5d7e1e -s ours
am skip reason: change_id Iab542b32a8a18ae0bdbd8e005c430a876f056806 with SHA1 60d4f1a5bd is in history

Change-Id: I925b0fc82a6a84ad6e6cc0970e54d1f011836090