[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev

am: 27ad19ee9e -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1 a4d0122048 is in history

Change-Id: Ia4a68691a8f7113c9575b4856a47f9c011a21653
This commit is contained in:
Xiao Ma
2019-04-23 02:28:06 -07:00
committed by android-build-merger

Diff Content Not Available