[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 56e7d278a8 am: e6f13e706f -s ours am: 73b0a1639b -s ours

Browse Source

am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 6cad4b10db is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428

Change-Id: Ib37a0e74c92305a3e52f152b586a84fc9d0c57e4

...

This commit is contained in:

TreeHugger Robot

2020-06-22 14:52:31 +00:00

committed by Automerger Merge Worker

parent f29f82315f 73b0a1639b

commit d9bf4a29d2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available