tree 045453cdfb4c935d2b0f17cebcc5f60bc1640a84
parent cae9ed6a146c91623693e8aa42be8120f07d7430
parent bdc4e22fe44ce31699be3841ab3358d7741d37d1
author Lucas Lin <lucaslin@google.com> 1616019560 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616019560 +0000

Merge "Modify the comment of getPrivateDnsMode" am: 625db39870 am: bdc4e22fe4 am: afcec9cbfe

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

Change-Id: I60147e1c828e5d82556e58b67b8f138f63228e8f