Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit dd0f5b2c authored by Jeffrey Vander Stoep's avatar Jeffrey Vander Stoep Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use base64 0.21.0" am: 5e544436 am: 2db14d0e -s ours 

am skip reason: Merged-In I83799c36a1028564468b2335940a20659955fe21 with SHA-1 8667ff4d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2425458



Change-Id: I7bc9b21cca51ad14e074df644a578c9541a93c85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 645c5c08 2db14d0e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment