tree 29ecc797081ef580a87084477c84446c49ec3954
parent df598dc827468280c76de0bdd5319c72e4778696
parent 7db7b331ef64f686f2ceda45917ea79129d24b5d
author Xiao Ma <xiaom@google.com> 1554981671 -0700
committer android-build-merger <android-build-merger@google.com> 1554981671 -0700

Merge "provide a resource overlay to configure customized DNS Server."
am: 7db7b331ef

Change-Id: Id1325ff7a46eed4f8cfdb181b5f5f097e9774ae0