| commit | 8b8f1c4e32bd96a066b8663ba67c0d0e9affc646 | [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 | 08cd949d5c1b41907325dac51e0dba4cc715ec7d | |
| parent | b8aeb4dde6740630f4f1b277e6bec2d131481a55 [diff] | |
| parent | c3ab7b66d3157d31531ddaa17575e020bb8fa890 [diff] |
[automerger skipped] Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e am: 735250d758 am: c3ab7b66d3 -s ours am skip reason: Merged-In I23e7ec140066979726d769cabc5f7057bb2167e6 with SHA-1 3077988ad2 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562 Change-Id: I6bf6c1259a83fb9763b286941b7df8fe6e491bcf