Skip to content
Commit 9694940b authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef"... 

[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf02 am: eb6daaa8 am: 9df8482c -s ours

am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 56451e28 is already in history

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

Change-Id: I6bf6c1259a83fb9763b286941b7df8fe6e491bcf
parents cd366b6e 9df8482c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment