tree f4717ec8447d602fed32676fe59013f0c83f4a25
parent ea1edcd99be66b638cdb95d256ebc43e9b2a4753
parent ef96bdc6bac39f20cbd391902b6ba67acb0a4cd0
author Frank Li <lifr@google.com> 1564116154 -0700
committer android-build-merger <android-build-merger@google.com> 1564116154 -0700

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

Change-Id: I9000912322fad90431a598380f6a0d209d822937