tree 0ca499727b358c642a96b3c9435c106a8d6a17c7
parent d5b2824f06ad694c7e8e95b1428742d1d67b5e88
parent 90310d279e87d83008e9b9e10168eb97c022c689
author Erik Kline <ek@google.com> 1516247690 +0000
committer android-build-merger <android-build-merger@google.com> 1516247690 +0000

Merge "Add basic resolution of Private DNS hostname"
am: 90310d279e

Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909