tree 22fca3fce1c22941e9cf7f0d60f1450549edd900
parent 5c5ee11ba0b5f0ab9fa9fa5fddd5fe44a4fcf2c4
parent 895594dcc28a5cd114eb12dedd7d91dd2943f96d
author Luke Huang <huangluke@google.com> 1593025884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593025884 +0000

[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours

am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history

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

Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa