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

Commit 6e0a9e6d authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am:... 

Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92 am: 95cb9a1c  -s ours" into pi-dev-plus-aosp
am: 9f376da4  -s ours

Change-Id: I6424a73acdc4829920e864b122455d4f90776aab
parents c1c6e576 9f376da4
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