| commit | 5b6ea3329d9eed03bddd3ab2fbc0de625def2a94 | [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 | dbb29fd3c34f21ac2b734189d6cfb9d8d9217bbe | |
| parent | 18a5fac66a24a68f9362c5f92f2c3647a3761c19 [diff] | |
| parent | bd90eed310d9cbf984e8dc26b5acba9b4e483bf4 [diff] |
[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49 am: da89f66c81 am: bd90eed310 -s ours am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 57ee606244 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562 Change-Id: I6bf6c1259a83fb9763b286941b7df8fe6e491bcf