| commit | 9694940b963fa5f5cb20f92db3899c0031b3ca53 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Wed May 12 18:24:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 18:24:14 2021 +0000 |
| tree | cff5b4f3416a443d9d1a1cf091a348120b576a65 | |
| parent | cd366b6eafd38cc9693dac6220f0fd5220c5fe68 [diff] | |
| parent | 9df8482c782f67a121b226108c44e81f01d12dbb [diff] |
[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf024c am: eb6daaa8af am: 9df8482c78 -s ours am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 56451e2847 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562 Change-Id: I6bf6c1259a83fb9763b286941b7df8fe6e491bcf