tree 08539a1bec06954975b0a98619ac85ec3b21c8f1
parent 5804521e8cc3c6ad3b5d801342fbe4297206b11f
parent 1742bf024c61f1ec0b6338f674836b30759e6e15
author Lucas Lin <lucaslin@google.com> 1620840225 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620840225 +0000

Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf024c

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

Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f