[automerger skipped] Merge "Have a new API to get private DNS mode" am: 179ecda65f am: 114103eaf2 am: 3373b94c0d -s ours

Browse Source

am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 b19b657309 is already in history

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

Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c

...

This commit is contained in:

Lucas Lin

2021-03-17 16:05:23 +00:00

committed by Automerger Merge Worker

parent 320315ac8c 3373b94c0d

commit f8de58f992

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available