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

Skip to content
Commit c411b2b0 authored by Pierre Imai's avatar Pierre Imai Committed by android-build-merger
Browse files

resolve merge conflicts of 3f03059e to nyc-dev-plus-aosp am: 441fddae 

am: f0d445b9

* commit 'f0d445b9':
  Test that changing the DNS search paths works.

Change-Id: I1aee4cdbc2918029f5e6e25cc4a15ec7980cfbec
parents d9e0d156 f0d445b9
Hide 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