commit | bd90eed310d9cbf984e8dc26b5acba9b4e483bf4 | [log] [tgz] |
---|---|---|
author | Lucas Lin <lucaslin@google.com> | Wed May 12 17:59:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 17:59:57 2021 +0000 |
tree | c5aeca53690e21c650e502352c4332fa8396c33a | |
parent | a6b91aafeeb8b512820203e69cd9d7700d15346b [diff] | |
parent | da89f66c817bf57d2688208c36048edfd1853602 [diff] |
Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49 am: da89f66c81 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562 Change-Id: I0b2ad20c59397395175b82688cfe657af43a1b19