tree ca786330d3eee54b37163a0d74d5f86b26273f3c
parent 39d2bed8d184f0f9d4bea0e446281400ed7b3eda
parent 3c16465df37623cf4879c86d96666058604fb83b
author Treehugger Robot <treehugger-gerrit@google.com> 1599816573 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599816573 +0000

Merge "Add '-unstable' to solve ODR violation" am: 0d5a8f6d59 am: 3c16465df3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1400347

Change-Id: I621749fd6b3722efccd481e647d69768048a2c18